marxin

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a81a6200ff5..0730d4392bb 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,7 +3,7 @@
 	* pt.c (lookup_template_class_1): Do not reinit template_info of an
 	alias here.
 
-2020-05-18  Martin Sebor  <[email protected]>
+2020-05-19  Martin Sebor  <[email protected]>

marxin

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a81a6200ff5..0730d4392bb 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,7 +3,7 @@
 	* pt.c (lookup_template_class_1): Do not reinit template_info of an
 	alias here.
 
-2020-05-18  Martin Sebor  <[email protected]>
+2020-05-19  Martin Sebor  <[email protected]>

marxin

diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index e4903cac4ef..7ba6658ddd0 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -385,7 +385,7 @@ class GitCommit:
                     continue
 
                 if not line.startswith('\t'):
-                    err = Error('line should start with a tab', line)
+                    err = Error('line must start with a tab', line)

marxin

diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index e4903cac4ef..7ba6658ddd0 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -385,7 +385,7 @@ class GitCommit:
                     continue
 
                 if not line.startswith('\t'):
-                    err = Error('line should start with a tab', line)
+                    err = Error('line must start with a tab', line)

marxin

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b97e8ea51f7..b3b6de2814f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,14 +1,10 @@
-2020-05-21  Uroš Bizjak  <[email protected]>
+2020-05-20  Uroš Bizjak  <[email protected]>
 
 	PR target/95218
-

marxin

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a808b710e7..1c90429a5ac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,12 +5,12 @@
 	(trunc<mode><sf2dfmode_lower>2) New expander.
 	(extend<sf2dfmode_lower><mode>2): Ditto.
 
-2020-05-23 Iain Sandoe <[email protected]>
+2020-05-23  Iain Sandoe  <[email protected]>

marxin

/* This file is auto-generated by optc-gen.awk.  */

#include "config.h"
#include "system.h"
#include "coretypes.h"
#include "options.h"
#include "tm.h"
#include "opts.h"
#include "intl.h"
#include "insn-attr-common.h"

marxin

--- gcc/options.c	2020-05-26 11:31:46.552566252 +0200
+++ /tmp/options.c	2020-05-26 11:31:42.984593986 +0200
@@ -1400,6 +1400,7 @@
   0, /* use_gnu_debug_info_extensions */
   0, /* help_enum_printed */
   0, /* help_printed */
+  0, /* aux_base_name */
   0, /* main_input_basename */
   0, /* main_input_filename */
   DINFO_LEVEL_NONE, /* debug_info_level */

marxin

            unknown error:     4
      multiple definition:   259
                    error:   283
                   Werror:    12
      broken-build-system:     1
                 segfault:     1
=== segfault (1) ===
guile1.log x86_64:[   83s]      15150 Segmentation fault      | GUILE="/home/abuild/rpmbuild/BUILD/guile-1.8.8/pre-inst-guile" ../scripts/snarf-check-and-output-texi > guile-procedures.texi
=== multiple definition (259) ===
4store.log x86_64:[  138s] (.text+0x0): multiple definition of `rasqal_mutex'; 4s-query.o (symbol from plugin):(.text+0x0): first defined here

marxin

diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 733a1a0f14a..7077880cf80 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -81,15 +81,23 @@ def update_current_branch():
         if (commit.author.email == '[email protected]'
                 and commit.message.strip() == 'Daily bump.'):
             break
-        commit = commit.parents[0]
+        # We support merge commits but only with 2 parensts