Merge commit 'f5a805d82902fe2d6e0a7af8c0e6519f9d25a8f3' into HEAD

6 files changed, 39 insertions, 11 deletions

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index faf7642..a85c1bf 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,26 @@
+2024-03-08  Sam James  <sam@gentoo.org>
+
+	PR other/109668
+	* dg-extract-results.sh: Check for python3 before python. Check for
+	python2 last.
+
+2024-03-07  Filip Kastl  <fkastl@suse.cz>
+
+	* test_mklog.py: "Moved to..." -> "Move to..."
+
+2024-03-01  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
+
+	* mklog.py: Use present tense in ChangeLog.
+
+2024-02-29  Andrew Pinski  <quic_apinski@quicinc.com>
+
+	* gcc-changelog/git_commit.py (bug_components): Add libcc1.
+
+2024-02-23  Richard Biener  <rguenther@suse.de>
+
+	PR target/90785
+	* config-list.mk (LIST): --enable-obsolete for ia64*-*-*.
+
 2024-02-05  Jakub Jelinek  <jakub@redhat.com>
 
 	* test_installed: Fill in HOSTCC, HOSTCXX, HOSTCFLAGS and
diff --git a/contrib/config-list.mk b/contrib/config-list.mk
index 0694cc1..16df66f 100644
--- a/contrib/config-list.mk
+++ b/contrib/config-list.mk
@@ -60,8 +60,9 @@ LIST = \
   i686-pc-linux-gnu i686-pc-msdosdjgpp i686-lynxos i686-nto-qnx \
   i686-rtems i686-solaris2.11 i686-wrs-vxworks \
   i686-wrs-vxworksae \
-  i686-cygwinOPT-enable-threads=yes i686-mingw32crt ia64-elf \
-  ia64-linux ia64-hpux ia64-hp-vms iq2000-elf lm32-elf \
+  i686-cygwinOPT-enable-threads=yes i686-mingw32crt ia64-elfOPT-enable-obsolete \
+  ia64-linuxOPT-enable-obsolete ia64-hpuxOPT-enable-obsolete \
+  ia64-hp-vmsOPT-enable-obsolete iq2000-elf lm32-elf \
   lm32-rtems lm32-uclinux \
   loongarch64-linux-gnuf64 loongarch64-linux-gnuf32 loongarch64-linux-gnusf \
   m32c-elf m32r-elf m32rle-elf \
diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh
index 00ef800..539d596 100755
--- a/contrib/dg-extract-results.sh
+++ b/contrib/dg-extract-results.sh
@@ -28,14 +28,17 @@
 
 PROGNAME=dg-extract-results.sh
 
-# Try to use the python version if possible, since it tends to be faster.
+# Try to use the python version if possible, since it tends to be faster and
+# produces more stable results.
 PYTHON_VER=`echo "$0" | sed 's/sh$/py/'`
-if test "$PYTHON_VER" != "$0" &&
-   test -f "$PYTHON_VER" &&
-   python -c 'import sys, getopt, re, io, datetime, operator; sys.exit (0 if sys.version_info >= (2, 6) else 1)' \
-     > /dev/null 2> /dev/null; then
-  exec python $PYTHON_VER "$@"
-fi
+for python in python3 python python2 ; do
+  if test "$PYTHON_VER" != "$0" &&
+     test -f "$PYTHON_VER" &&
+     ${python} -c 'import sys, getopt, re, io, datetime, operator; sys.exit (0 if sys.version_info >= (2, 6) else 1)' \
+       > /dev/null 2> /dev/null; then
+    exec ${python} $PYTHON_VER "$@"
+  fi
+done
 
 usage() {
   cat <<EOF >&2
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 87bec4e..87ecb9e 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -105,6 +105,7 @@ bug_components = {
     'java',
     'jit',
     'libbacktrace',
+    'libcc1',
     'libf2c',
     'libffi',
     'libfortran',
diff --git a/contrib/mklog.py b/contrib/mklog.py
index d764fb4..7d8d554 100755
--- a/contrib/mklog.py
+++ b/contrib/mklog.py
@@ -277,7 +277,7 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False,
                 # it used to be path.source_file[2:]
                 relative_path = get_rel_path_if_prefixed(file.source_file[2:],
                                                          changelog)
-                out = append_changelog_line(out, relative_path, 'Moved to...')
+                out = append_changelog_line(out, relative_path, 'Move to...')
                 new_path = get_rel_path_if_prefixed(file.target_file[2:],
                                                     changelog)
                 out += f'\t* {new_path}: ...here.\n'
diff --git a/contrib/test_mklog.py b/contrib/test_mklog.py
index b621073..80e159f 100755
--- a/contrib/test_mklog.py
+++ b/contrib/test_mklog.py
@@ -400,7 +400,7 @@ rename to gcc/ipa-icf2.c
 EXPECTED8 = '''\
 gcc/ChangeLog:
 
-	* ipa-icf.c: Moved to...
+	* ipa-icf.c: Move to...
 	* ipa-icf2.c: ...here.
 
 '''