From 3b0155305e5168b48d19f74e9bfcdf423a532ada Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 19 Mar 2021 10:03:02 +0000 Subject: substitute @tie{} with a space for the man pages contrib/ 2021-03-19 Matthias Klose * texi2pod.pl: Substitute @tie{} with a space for the man pages. --- contrib/texi2pod.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/texi2pod.pl b/contrib/texi2pod.pl index 608dff4..5fcf0a1 100755 --- a/contrib/texi2pod.pl +++ b/contrib/texi2pod.pl @@ -210,6 +210,7 @@ while(<$inf>) { s/\@TeX\{\}/TeX/g; s/\@pounds\{\}/\#/g; s/\@minus(?:\{\})?/-/g; + s/\@tie\{\}/ /g; s/\\,/,/g; # Now the ones that have to be replaced by special escapes -- cgit v1.1 From 5f256a70a05fcfc5a1caf56678ceb12b4f87f781 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Sat, 20 Mar 2021 00:16:24 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index acf530e..4f29464 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-03-19 Matthias Klose + + * texi2pod.pl: Substitute @tie{} with a space for the man pages. + 2021-03-16 Martin Liska * gcc-changelog/git_update_version.py: Skip one problematic -- cgit v1.1 From c38f679eebffd601d977330f24def69f4b620c93 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 22 Mar 2021 10:53:57 +0100 Subject: mklog: add new argument --directory. The argument is handy when one needs to generate ChangeLog entries for a different project (e.g. binutils). contrib/ChangeLog: * mklog.py: Add --directory argument. --- contrib/mklog.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 6509886..00a001e 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -71,7 +71,7 @@ gcc_root = os.path.dirname(os.path.dirname(script_folder)) def find_changelog(path): folder = os.path.split(path)[0] while True: - if os.path.exists(os.path.join(gcc_root, folder, 'ChangeLog')): + if os.path.exists(os.path.join(args.directory, folder, 'ChangeLog')): return folder folder = os.path.dirname(folder) if folder == '': @@ -277,6 +277,9 @@ if __name__ == '__main__': help='Do not generate function names in ChangeLogs') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', help='Download title of mentioned PRs') + parser.add_argument('-d', '--directory', default=gcc_root, + help='Root directory where to search for ChangeLog ' + 'files') parser.add_argument('-c', '--changelog', help='Append the ChangeLog to a git commit message ' 'file') -- cgit v1.1 From 8b744f46a2426b6656e52ace697a569795c9153a Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 23 Mar 2021 00:16:25 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 4f29464..c1d9b52 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-03-22 Martin Liska + + * mklog.py: Add --directory argument. + 2021-03-19 Matthias Klose * texi2pod.pl: Substitute @tie{} with a space for the man pages. -- cgit v1.1 From e54da1b6b39baadded02a28382bb6efb70e687c1 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 23 Mar 2021 08:49:25 +0100 Subject: mklog: fix test_mklog.py tests. contrib/ChangeLog: * mklog.py: Fix broken tests. --- contrib/mklog.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 00a001e..1604f05 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -65,13 +65,13 @@ PATCH must be generated using diff(1)'s -up or -cp options """ script_folder = os.path.realpath(__file__) -gcc_root = os.path.dirname(os.path.dirname(script_folder)) +root = os.path.dirname(os.path.dirname(script_folder)) def find_changelog(path): folder = os.path.split(path)[0] while True: - if os.path.exists(os.path.join(args.directory, folder, 'ChangeLog')): + if os.path.exists(os.path.join(root, folder, 'ChangeLog')): return folder folder = os.path.dirname(folder) if folder == '': @@ -277,7 +277,7 @@ if __name__ == '__main__': help='Do not generate function names in ChangeLogs') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', help='Download title of mentioned PRs') - parser.add_argument('-d', '--directory', default=gcc_root, + parser.add_argument('-d', '--directory', help='Root directory where to search for ChangeLog ' 'files') parser.add_argument('-c', '--changelog', @@ -288,6 +288,8 @@ if __name__ == '__main__': args = parser.parse_args() if args.input == '-': args.input = None + if args.directory: + root = args.directory data = open(args.input) if args.input else sys.stdin if args.update_copyright: -- cgit v1.1 From bf1f3168f474734400e7a97660d1e7dec664bca9 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 24 Mar 2021 00:16:25 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index c1d9b52..ee7b5b5 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-03-23 Martin Liska + + * mklog.py: Fix broken tests. + 2021-03-22 Martin Liska * mklog.py: Add --directory argument. -- cgit v1.1 From a694a02125f181afe2ae461dd8f35c6f5f54ad22 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 12 Apr 2021 13:16:22 +0200 Subject: mklog: support long filenames contrib/ChangeLog: * gcc-changelog/git_commit.py: Support long filenames in entries. * gcc-changelog/test_email.py: Test it. * gcc-changelog/test_patches.txt: Likewise. --- contrib/gcc-changelog/git_commit.py | 6 ++++-- contrib/gcc-changelog/test_email.py | 4 ++++ contrib/gcc-changelog/test_patches.txt | 35 ++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 43fa7f4..90e908e 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -415,8 +415,10 @@ class GitCommit: if line != line.rstrip(): self.errors.append(Error('trailing whitespace', line)) if len(line.replace('\t', ' ' * TAB_WIDTH)) > LINE_LIMIT: - self.errors.append(Error('line exceeds %d character limit' - % LINE_LIMIT, line)) + # support long filenames + if not line.startswith('\t* ') or not line.endswith(':'): + self.errors.append(Error('line exceeds %d character limit' + % LINE_LIMIT, line)) m = changelog_regex.match(line) if m: last_entry = ChangeLogEntry(m.group(1).rstrip('/'), diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 9d052e0..8abf5c3 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -420,3 +420,7 @@ class TestGccChangelog(unittest.TestCase): def test_changelog_removal(self): email = self.from_patch_glob('0001-ChangeLog-removal.patch', strict=True) assert not email.errors + + def test_long_filenames(self): + email = self.from_patch_glob('0001-long-filenames') + assert not email.errors diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt index 012573b..3f9806d 100644 --- a/contrib/gcc-changelog/test_patches.txt +++ b/contrib/gcc-changelog/test_patches.txt @@ -3511,3 +3511,38 @@ index 5dd33a75c3a..c4ce432cb98 100644 -- 2.30.1 +=== 0001-long-filenames === +From 0a5b3f87bdac5e61f9a626c795d30f9e93198585 Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Mon, 12 Apr 2021 13:10:14 +0200 +Subject: [PATCH] libstdc++: Fix some tests that fail in C++20 mode + +The linear_congruential_engine negative tests fail with a different +error in C++20 mode, because double is no longer an invalid type for +NTTP. Adjust the expected errors. + +libstdc++-v3/ChangeLog: + + * testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc: + Adjust expected error for C++20 mode. + * testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc: + Likewise. +--- + .../linear_congruential_engine/requirements/non_uint_neg.cc | 4 +++- + .../random/linear_congruential/requirements/non_uint_neg.cc | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc b/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc +index e04e8ca6972..a36d63c6c7b 100644 +--- a/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc ++++ b/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc +@@ -1 +1,2 @@ + ++ +diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc +index 5ad82db1def..53b15f32516 100644 +--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc ++++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc +@@ -1 +1,2 @@ + ++ -- cgit v1.1 From 1c35444b919683be23208479312a45e73d23ed35 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 12 Apr 2021 14:11:27 +0200 Subject: gcc-changelog: do not allow space in long line contrib/ChangeLog: * gcc-changelog/git_commit.py: Do not allow space in long lines. --- contrib/gcc-changelog/git_commit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 90e908e..b28f7de 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -416,7 +416,7 @@ class GitCommit: self.errors.append(Error('trailing whitespace', line)) if len(line.replace('\t', ' ' * TAB_WIDTH)) > LINE_LIMIT: # support long filenames - if not line.startswith('\t* ') or not line.endswith(':'): + if not line.startswith('\t* ') or not line.endswith(':') or ' ' in line[3:-1]: self.errors.append(Error('line exceeds %d character limit' % LINE_LIMIT, line)) m = changelog_regex.match(line) -- cgit v1.1 From 287ad814d7703a26d5623a9deafd5932c248d49c Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 13 Apr 2021 00:16:21 +0000 Subject: Daily bump. --- contrib/ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index ee7b5b5..39f46c4 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,14 @@ +2021-04-12 Martin Liska + + * gcc-changelog/git_commit.py: Do not allow space in long lines. + +2021-04-12 Martin Liska + + * gcc-changelog/git_commit.py: Support long filenames + in entries. + * gcc-changelog/test_email.py: Test it. + * gcc-changelog/test_patches.txt: Likewise. + 2021-03-23 Martin Liska * mklog.py: Fix broken tests. -- cgit v1.1 From 919323c1a4a126615623f9e90dd29d455703348b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 20 Apr 2021 10:50:22 +0200 Subject: Update crontab and git_update_version.py 2021-04-20 Jakub Jelinek maintainer-scripts/ * crontab: Snapshots from trunk are now GCC 12 related. Add GCC 11 snapshots from the respective branch. contrib/ * gcc-changelog/git_update_version.py (active_refs): Add releases/gcc-11. --- contrib/gcc-changelog/git_update_version.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index 1e2b22b..9bc41bb 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -57,7 +57,8 @@ def prepend_to_changelog_files(repo, folder, git_commit, add_to_git): repo.git.add(full_path) -active_refs = ['master', 'releases/gcc-8', 'releases/gcc-9', 'releases/gcc-10'] +active_refs = ['master', 'releases/gcc-8', 'releases/gcc-9', 'releases/gcc-10', + 'releases/gcc-11'] parser = argparse.ArgumentParser(description='Update DATESTAMP and generate ' 'ChangeLog entries') -- cgit v1.1 From be8aad8d73f47e2581c873ba1069489e071c2a86 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 21 Apr 2021 00:16:23 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 39f46c4..68ad244 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-04-20 Jakub Jelinek + + * gcc-changelog/git_update_version.py (active_refs): Add + releases/gcc-11. + 2021-04-12 Martin Liska * gcc-changelog/git_commit.py: Do not allow space in long lines. -- cgit v1.1 From 0745b6fa66c69cc1e27547601298843c26f0e144 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Thu, 22 Apr 2021 17:41:10 -0400 Subject: aix: Remove AIX 6.1 support. AIX 6.1 is past end of life and extended support. This patch removes the configuration option and references to AIX 6.1. contrib/ChangeLog: * config-list.mk: Remove rs6000-ibm-aix6.1. Rename rs6000-ibm-aix7.1 to powerpc-ibm-aix7.1. Add powerpc-ibm-aix7.2. gcc/ChangeLog: * config.gcc (powerpc-ibm-aix6.*): Remove. * config/rs6000/aix61.h: Delete. --- contrib/config-list.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/config-list.mk b/contrib/config-list.mk index 8a4ce8a..b9e9dd0 100644 --- a/contrib/config-list.mk +++ b/contrib/config-list.mk @@ -84,7 +84,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \ powerpcle-eabisim powerpcle-eabi \ pru-elf \ riscv32-unknown-linux-gnu riscv64-unknown-linux-gnu \ - rs6000-ibm-aix6.1 rs6000-ibm-aix7.1 \ + powerpc-ibm-aix7.1 powerpc-ibm-aix7.2 \ rl78-elf rx-elf s390-linux-gnu s390x-linux-gnu s390x-ibm-tpf sh-elf \ shle-linux sh-netbsdelf sh-superh-elf \ sh-rtems sh-wrs-vxworks sparc-elf \ -- cgit v1.1 From e3948473e927a7c3197ce1a63628fe427f15f6c6 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Fri, 23 Apr 2021 00:16:25 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 68ad244..e0a0843 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-04-22 David Edelsohn + + * config-list.mk: Remove rs6000-ibm-aix6.1. + Rename rs6000-ibm-aix7.1 to powerpc-ibm-aix7.1. + Add powerpc-ibm-aix7.2. + 2021-04-20 Jakub Jelinek * gcc-changelog/git_update_version.py (active_refs): Add -- cgit v1.1 From bbadf83e5a2a1e3bf713dd41391e149aea2d61db Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 27 Apr 2021 11:01:25 +0200 Subject: Update gennews for GCC 10 and GCC 11. 2021-04-27 Jakub Jelinek * gennews (files): Add files for GCC 10 and GCC 11. --- contrib/gennews | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gennews b/contrib/gennews index be8b55f..cd773cd 100755 --- a/contrib/gennews +++ b/contrib/gennews @@ -3,7 +3,7 @@ # Script to generate the NEWS file from online release notes. # Contributed by Joseph Myers . # -# Copyright (C) 2000-2019 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 Free Software Foundation, Inc. # This file is part of GCC. # # GCC is free software; you can redistribute it and/or modify @@ -23,6 +23,8 @@ website=http://gcc.gnu.org/ files=" + gcc-11/index.html gcc-11/changes.html + gcc-10/index.html gcc-10/changes.html gcc-9/index.html gcc-9/changes.html gcc-8/index.html gcc-8/changes.html gcc-7/index.html gcc-7/changes.html -- cgit v1.1 From 8f54dd61e79842eebf678571b9987bda7502f3aa Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 28 Apr 2021 00:16:36 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e0a0843..5468f33 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-04-27 Jakub Jelinek + + * gennews (files): Add files for GCC 10 and GCC 11. + 2021-04-22 David Edelsohn * config-list.mk: Remove rs6000-ibm-aix6.1. -- cgit v1.1 From fea26bad2e5b9078d6a6b16d5e48653e31794273 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 12 Mar 2021 09:31:37 +0100 Subject: gcc-changelog: Remove components that will be removed. contrib/ChangeLog: * gcc-changelog/git_commit.py: Remove components that will be removed. --- contrib/gcc-changelog/git_commit.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index b28f7de..89461cc 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -30,7 +30,6 @@ changelog_locations = { 'fixincludes', 'gcc/ada', 'gcc/analyzer', - 'gcc/brig', 'gcc/c', 'gcc/c-family', 'gcc', @@ -62,7 +61,6 @@ changelog_locations = { 'libgcc/config/libbid', 'libgfortran', 'libgomp', - 'libhsail-rt', 'libiberty', 'libitm', 'libobjc', -- cgit v1.1 From 933c5149e934d104e929b9c3be8a413dec92a096 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 10 May 2021 12:11:48 +0200 Subject: gcc_update: fix check for local source tree. contrib/ChangeLog: * gcc_update: Start using reload.c instead of version.c. --- contrib/gcc_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc_update b/contrib/gcc_update index 45a27b7..04dc490 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -243,7 +243,7 @@ apply_patch () { } # Check whether this indeed looks like a local tree. -if [ ! -f gcc/version.c ]; then +if [ ! -f gcc/reload.c ]; then echo "This does not seem to be a GCC tree!" exit fi -- cgit v1.1 From 3e5605f0a961f9688f4c84b59d3e62ad23530fc4 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 10 May 2021 13:44:18 +0200 Subject: Revert "gcc-changelog: Remove components that will be removed." This reverts commit fea26bad2e5b9078d6a6b16d5e48653e31794273. --- contrib/gcc-changelog/git_commit.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 89461cc..b28f7de 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -30,6 +30,7 @@ changelog_locations = { 'fixincludes', 'gcc/ada', 'gcc/analyzer', + 'gcc/brig', 'gcc/c', 'gcc/c-family', 'gcc', @@ -61,6 +62,7 @@ changelog_locations = { 'libgcc/config/libbid', 'libgfortran', 'libgomp', + 'libhsail-rt', 'libiberty', 'libitm', 'libobjc', -- cgit v1.1 From c1d381f0079a8594957be0513a00627caa219b73 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 10 May 2021 14:36:52 +0200 Subject: contrib/gcc-changelog: Detect if same file appears twice contrib/ChangeLog: * gcc-changelog/git_commit.py (Error.__repr__): Add space after the colon. (GitCommit.check_mentioned_files): Check whether the same file has been specified multiple times. * gcc-changelog/test_email.py (TestGccChangelog.test_multi_same_file): New. * gcc-changelog/test_patches.txt (0001-OpenMP-Fix-SIMT): New test. --- contrib/gcc-changelog/git_commit.py | 9 +++++++-- contrib/gcc-changelog/test_email.py | 4 ++++ contrib/gcc-changelog/test_patches.txt | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index b28f7de..d9332cb 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -200,7 +200,7 @@ class Error: def __repr__(self): s = self.message if self.line: - s += ':"%s"' % self.line + s += ': "%s"' % self.line return s @@ -629,7 +629,12 @@ class GitCommit: assert not entry.folder.endswith('/') for file in entry.files: if not self.is_changelog_filename(file): - mentioned_files.add(os.path.join(entry.folder, file)) + item = os.path.join(entry.folder, file) + if item in mentioned_files: + msg = 'same file specified multiple times' + self.errors.append(Error(msg, file)) + else: + mentioned_files.add(item) for pattern in entry.file_patterns: mentioned_patterns.append(os.path.join(entry.folder, pattern)) diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 8abf5c3..d66bf5b 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -424,3 +424,7 @@ class TestGccChangelog(unittest.TestCase): def test_long_filenames(self): email = self.from_patch_glob('0001-long-filenames') assert not email.errors + + def test_multi_same_file(self): + email = self.from_patch_glob('0001-OpenMP-Fix-SIMT') + assert email.errors[0].message == 'same file specified multiple times' diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt index 3f9806d..7e4a4b0 100644 --- a/contrib/gcc-changelog/test_patches.txt +++ b/contrib/gcc-changelog/test_patches.txt @@ -3546,3 +3546,32 @@ index 5ad82db1def..53b15f32516 100644 @@ -1 +1,2 @@ + + +=== 0001-OpenMP-Fix-SIMT === +From 33b647956caa977d1ae489f9baed9cef70b4f382 Mon Sep 17 00:00:00 2001 +From: Tobias Burnus +Date: Fri, 7 May 2021 12:11:51 +0200 +Subject: [PATCH] OpenMP: Fix SIMT for complex/float reduction with && and || + +libgomp/ChangeLog: + + * testsuite/libgomp.c-c++-common/reduction-5.c: New test, testing + complex/floating-point || + && reduction with 'omp target'. + * testsuite/libgomp.c-c++-common/reduction-5.c: Likewise. +--- +diff --git a/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c b/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c +new file mode 100644 +index 00000000000..21540512e23 +--- /dev/null ++++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-5.c +@@ -0,0 +1,1 @@ ++ +diff --git a/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c b/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c +new file mode 100644 +index 00000000000..21540512e23 +--- /dev/null ++++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-6.c +@@ -0,0 +1,1 @@ ++ +-- +2.25.1 -- cgit v1.1 From 8300c34660b1711fad1cbdafd9aa470d19f5a47d Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 10 May 2021 15:13:37 +0200 Subject: contrib/gcc-changelog: Add/improve --help contrib/ChangeLog: * gcc-changelog/git_check_commit.py (__Main__): State in --help the default value for 'revisions'. * gcc-changelog/git_email.py (show_help): Add. (__main__): Handle -h and --help. --- contrib/gcc-changelog/git_check_commit.py | 3 ++- contrib/gcc-changelog/git_email.py | 21 ++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_check_commit.py b/contrib/gcc-changelog/git_check_commit.py index 935425e..246e973 100755 --- a/contrib/gcc-changelog/git_check_commit.py +++ b/contrib/gcc-changelog/git_check_commit.py @@ -23,7 +23,8 @@ from git_repository import parse_git_revisions parser = argparse.ArgumentParser(description='Check git ChangeLog format ' 'of a commit') parser.add_argument('revisions', default='HEAD', nargs='?', - help='Git revisions (e.g. hash~5..hash or just hash)') + help='Git revisions (e.g. hash~5..hash or just hash) - ' + 'if not specified: HEAD') parser.add_argument('-g', '--git-path', default='.', help='Path to git repository') parser.add_argument('-p', '--print-changelog', action='store_true', diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index b0547b3..7ebf4c4 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -72,10 +72,25 @@ class GitEmail(GitCommit): commit_to_info_hook=lambda x: None) -# With zero arguments, process every patch file in the ./patches directory. -# With one argument, process the named patch file. -# Patch files must be in 'git format-patch' format. +def show_help(): + print(""" +usage: git_email.py [--help] [patch file ...] + +Check git ChangeLog format of a patch + +With zero arguments, process every patch file in the +./patches directory. +With one argument, process the named patch file. + +Patch files must be in 'git format-patch' format. +""") + sys.exit(0) + + if __name__ == '__main__': + if len(sys.argv) == 2 and (sys.argv[1] == '-h' or sys.argv[1] == '--help'): + show_help() + if len(sys.argv) == 1: allfiles = [] for root, _dirs, files in os.walk('patches'): -- cgit v1.1 From 0fd1a54ba32df4316ea920e9877c66f79605df50 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 10 May 2021 15:17:06 +0200 Subject: gcc-changelog: remove newlines in git_email.py --help contrib/ChangeLog: * gcc-changelog/git_email.py: Remove newlines when --help is used. --- contrib/gcc-changelog/git_email.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index 7ebf4c4..65ccb8c 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -73,8 +73,7 @@ class GitEmail(GitCommit): def show_help(): - print(""" -usage: git_email.py [--help] [patch file ...] + print("""usage: git_email.py [--help] [patch file ...] Check git ChangeLog format of a patch @@ -82,8 +81,7 @@ With zero arguments, process every patch file in the ./patches directory. With one argument, process the named patch file. -Patch files must be in 'git format-patch' format. -""") +Patch files must be in 'git format-patch' format.""") sys.exit(0) -- cgit v1.1 From aa891c56f25baac94db004e309d1b6e40b770a95 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 11 May 2021 00:16:36 +0000 Subject: Daily bump. --- contrib/ChangeLog | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 5468f33..2d6e29f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,40 @@ +2021-05-10 Martin Liska + + * gcc-changelog/git_email.py: Remove newlines when --help + is used. + +2021-05-10 Tobias Burnus + + * gcc-changelog/git_check_commit.py (__Main__): State in --help + the default value for 'revisions'. + * gcc-changelog/git_email.py (show_help): Add. + (__main__): Handle -h and --help. + +2021-05-10 Tobias Burnus + + * gcc-changelog/git_commit.py (Error.__repr__): Add space after the colon. + (GitCommit.check_mentioned_files): Check whether the same file has been + specified multiple times. + * gcc-changelog/test_email.py (TestGccChangelog.test_multi_same_file): New. + * gcc-changelog/test_patches.txt (0001-OpenMP-Fix-SIMT): New test. + +2021-05-10 Martin Liska + + Revert: + 2021-05-10 Martin Liska + + * gcc-changelog/git_commit.py: Remove components that will be + removed. + +2021-05-10 Martin Liska + + * gcc_update: Start using reload.c instead of version.c. + +2021-05-10 Martin Liska + + * gcc-changelog/git_commit.py: Remove components that will be + removed. + 2021-04-27 Jakub Jelinek * gennews (files): Add files for GCC 10 and GCC 11. -- cgit v1.1 From 772e5e82e3114f6faccb549cfcc30c06b4678354 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 10 May 2021 13:51:22 +0200 Subject: gcc-changelog: Accept ref_name argument in GitCommit. contrib/ChangeLog: * gcc-changelog/git_commit.py: Remove ChangeLog locations based on ref_name. * gcc-changelog/git_repository.py: Likewise. --- contrib/gcc-changelog/git_commit.py | 29 ++++++++++++++++++++--------- contrib/gcc-changelog/git_repository.py | 5 +++-- 2 files changed, 23 insertions(+), 11 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index d9332cb..4a3f969 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -19,8 +19,9 @@ import difflib import os import re +import sys -changelog_locations = { +default_changelog_locations = { 'c++tools', 'config', 'contrib', @@ -287,7 +288,7 @@ class GitInfo: class GitCommit: - def __init__(self, info, strict=True, commit_to_info_hook=None): + def __init__(self, info, strict=True, commit_to_info_hook=None, ref_name=None): self.original_info = info self.info = info self.message = None @@ -300,6 +301,7 @@ class GitCommit: self.cherry_pick_commit = None self.revert_commit = None self.commit_to_info_hook = commit_to_info_hook + self.init_changelog_locations(ref_name) # Skip Update copyright years commits if self.info.lines and self.info.lines[0] == 'Update copyright years.': @@ -361,15 +363,14 @@ class GitCommit: else: return False - @classmethod - def find_changelog_location(cls, name): + def find_changelog_location(self, name): if name.startswith('\t'): name = name[1:] if name.endswith(':'): name = name[:-1] if name.endswith('/'): name = name[:-1] - return name if name in changelog_locations else None + return name if name in self.changelog_locations else None @classmethod def format_git_author(cls, author): @@ -389,6 +390,17 @@ class GitCommit: modified_files.append((parts[2], 'A')) return modified_files + def init_changelog_locations(self, ref_name): + self.changelog_locations = list(default_changelog_locations) + if ref_name: + version = sys.maxsize + if ref_name.startswith('refs/heads/releases/gcc-'): + version = int(ref_name.split('-')[-1]) + if version >= 12: + # HSA and BRIG were removed in GCC 12 + self.changelog_locations.remove('gcc/brig') + self.changelog_locations.remove('libhsail-rt') + def parse_lines(self, all_are_ignored): body = self.info.lines @@ -586,7 +598,7 @@ class GitCommit: for file in entry.files: location = self.get_file_changelog_location(file) if (location == '' - or (location and location in changelog_locations)): + or (location and location in self.changelog_locations)): if changelog and changelog != location: msg = 'could not deduce ChangeLog file, ' \ 'not unique location' @@ -606,11 +618,10 @@ class GitCommit: return True return False - @classmethod - def get_changelog_by_path(cls, path): + def get_changelog_by_path(self, path): components = path.split('/') while components: - if '/'.join(components) in changelog_locations: + if '/'.join(components) in self.changelog_locations: break components = components[:-1] return '/'.join(components) diff --git a/contrib/gcc-changelog/git_repository.py b/contrib/gcc-changelog/git_repository.py index a0e293d..501c0d9 100755 --- a/contrib/gcc-changelog/git_repository.py +++ b/contrib/gcc-changelog/git_repository.py @@ -29,7 +29,7 @@ except ImportError: from git_commit import GitCommit, GitInfo, decode_path -def parse_git_revisions(repo_path, revisions, strict=True): +def parse_git_revisions(repo_path, revisions, strict=True, ref_name=None): repo = Repo(repo_path) def commit_to_info(commit): @@ -73,6 +73,7 @@ def parse_git_revisions(repo_path, revisions, strict=True): for commit in commits: git_commit = GitCommit(commit_to_info(commit.hexsha), strict=strict, - commit_to_info_hook=commit_to_info) + commit_to_info_hook=commit_to_info, + ref_name=ref_name) parsed_commits.append(git_commit) return parsed_commits -- cgit v1.1 From 8f67bf25a48a6fd235bdba13c8708a686d942772 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 10 May 2021 14:13:53 +0200 Subject: gcc-changelog: Remove non-strict mode. contrib/ChangeLog: * gcc-changelog/git_check_commit.py: Remove --non-strict-mode. * gcc-changelog/git_commit.py: Remove strict mode. * gcc-changelog/git_email.py: Likewise. * gcc-changelog/git_repository.py: Likewise. * gcc-changelog/test_email.py: Likewise. * gcc-changelog/test_patches.txt: Update patches so that they don't contain a ChangeLog file changes. --- contrib/gcc-changelog/git_check_commit.py | 6 +- contrib/gcc-changelog/git_commit.py | 4 +- contrib/gcc-changelog/git_email.py | 4 +- contrib/gcc-changelog/git_repository.py | 4 +- contrib/gcc-changelog/test_email.py | 19 +- contrib/gcc-changelog/test_patches.txt | 401 +++++++++--------------------- 6 files changed, 132 insertions(+), 306 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_check_commit.py b/contrib/gcc-changelog/git_check_commit.py index 246e973..9a4c5d4 100755 --- a/contrib/gcc-changelog/git_check_commit.py +++ b/contrib/gcc-changelog/git_check_commit.py @@ -29,14 +29,10 @@ parser.add_argument('-g', '--git-path', default='.', help='Path to git repository') parser.add_argument('-p', '--print-changelog', action='store_true', help='Print final changelog entires') -parser.add_argument('-n', '--non-strict-mode', action='store_true', - help='Use non-strict mode (allow changes in ChangeLog and ' - 'other automatically updated files).') args = parser.parse_args() retval = 0 -for git_commit in parse_git_revisions(args.git_path, args.revisions, - not args.non_strict_mode): +for git_commit in parse_git_revisions(args.git_path, args.revisions): res = 'OK' if git_commit.success else 'FAILED' print('Checking %s: %s' % (git_commit.original_info.hexsha, res)) if git_commit.success: diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 4a3f969..c70279e 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -288,7 +288,7 @@ class GitInfo: class GitCommit: - def __init__(self, info, strict=True, commit_to_info_hook=None, ref_name=None): + def __init__(self, info, commit_to_info_hook=None, ref_name=None): self.original_info = info self.info = info self.message = None @@ -325,7 +325,7 @@ class GitCommit: if len(project_files) == len(self.info.modified_files): # All modified files are only MISC files return - elif project_files and strict: + elif project_files: self.errors.append(Error('ChangeLog, DATESTAMP, BASE-VER and ' 'DEV-PHASE updates should be done ' 'separately from normal commits')) diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index 65ccb8c..6933e3d 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -32,7 +32,7 @@ unidiff_supports_renaming = hasattr(PatchedFile(), 'is_rename') class GitEmail(GitCommit): - def __init__(self, filename, strict=False): + def __init__(self, filename): self.filename = filename diff = PatchSet.from_filename(filename) date = None @@ -68,7 +68,7 @@ class GitEmail(GitCommit): t = 'M' modified_files.append((target if t != 'D' else source, t)) git_info = GitInfo(None, date, author, body, modified_files) - super().__init__(git_info, strict=strict, + super().__init__(git_info, commit_to_info_hook=lambda x: None) diff --git a/contrib/gcc-changelog/git_repository.py b/contrib/gcc-changelog/git_repository.py index 501c0d9..2d68882 100755 --- a/contrib/gcc-changelog/git_repository.py +++ b/contrib/gcc-changelog/git_repository.py @@ -29,7 +29,7 @@ except ImportError: from git_commit import GitCommit, GitInfo, decode_path -def parse_git_revisions(repo_path, revisions, strict=True, ref_name=None): +def parse_git_revisions(repo_path, revisions, ref_name=None): repo = Repo(repo_path) def commit_to_info(commit): @@ -72,7 +72,7 @@ def parse_git_revisions(repo_path, revisions, strict=True, ref_name=None): commits = [repo.commit(revisions)] for commit in commits: - git_commit = GitCommit(commit_to_info(commit.hexsha), strict=strict, + git_commit = GitCommit(commit_to_info(commit.hexsha), commit_to_info_hook=commit_to_info, ref_name=ref_name) parsed_commits.append(git_commit) diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index d66bf5b..7472762 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -62,17 +62,17 @@ class TestGccChangelog(unittest.TestCase): assert t.endswith('.patch') os.remove(t) - def get_git_email(self, filename, strict=False): + def get_git_email(self, filename): with tempfile.NamedTemporaryFile(mode='w+', suffix='.patch', delete=False) as f: f.write('\n'.join(self.patches[filename])) self.temps.append(f.name) - return GitEmail(f.name, strict) + return GitEmail(f.name) - def from_patch_glob(self, name, strict=False): + def from_patch_glob(self, name): files = [f for f in self.patches.keys() if f.startswith(name)] assert len(files) == 1 - return self.get_git_email(files[0], strict) + return self.get_git_email(files[0]) def test_simple_patch_format(self): email = self.get_git_email('0577-aarch64-Add-an-and.patch') @@ -247,7 +247,7 @@ class TestGccChangelog(unittest.TestCase): assert email.changelog_entries[1].prs == [] def test_multiple_prs_not_added(self): - email = self.from_patch_glob('0001-Add-patch_are') + email = self.from_patch_glob('0002-Add-patch_are') assert not email.errors assert email.changelog_entries[0].prs == ['PR target/93492'] assert email.changelog_entries[1].prs == ['PR target/12345'] @@ -255,18 +255,17 @@ class TestGccChangelog(unittest.TestCase): assert email.changelog_entries[2].folder == 'gcc/testsuite' def test_strict_mode(self): - email = self.from_patch_glob('0001-Add-patch_are', - True) + email = self.from_patch_glob('0001-Add-patch_are') msg = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates should ' \ 'be done separately from normal commits' assert email.errors[0].message == msg def test_strict_mode_normal_patch(self): - email = self.get_git_email('0001-Just-test-it.patch', True) + email = self.get_git_email('0001-Just-test-it.patch') assert not email.errors def test_strict_mode_datestamp_only(self): - email = self.get_git_email('0002-Bump-date.patch', True) + email = self.get_git_email('0002-Bump-date.patch') assert not email.errors def test_wrong_changelog_entry(self): @@ -418,7 +417,7 @@ class TestGccChangelog(unittest.TestCase): assert email.errors[0].message == 'bad parentheses wrapping' def test_changelog_removal(self): - email = self.from_patch_glob('0001-ChangeLog-removal.patch', strict=True) + email = self.from_patch_glob('0001-ChangeLog-removal.patch') assert not email.errors def test_long_filenames(self): diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt index 7e4a4b0..39d40b8 100644 --- a/contrib/gcc-changelog/test_patches.txt +++ b/contrib/gcc-changelog/test_patches.txt @@ -68,13 +68,6 @@ xxxx-xx-xx Claudiu Zissulescu create mode 100644 gcc/testsuite/gcc.target/arc/uncached-7.c create mode 100644 gcc/testsuite/gcc.target/arc/uncached-8.c -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 91dfcd71a4b..2cc61d68cf3 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index 22475f2732e..e1a865f02e6 100644 --- a/gcc/config/arc/arc.c @@ -89,13 +82,6 @@ index cf7aa8d83c9..46cb254ed28 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 16ddef07516..991934272e0 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/gcc.target/arc/arc.exp b/gcc/testsuite/gcc.target/arc/arc.exp index 8d1844edd22..501d4589c53 100644 --- a/gcc/testsuite/gcc.target/arc/arc.exp @@ -199,20 +185,6 @@ without any data fields. 4 files changed, 36 insertions(+) create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr93667.C -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 77c2a9ad810..6b53f9a2f07 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 9b4fe11a6f6..8033fa0a3bb 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr93667.C b/gcc/testsuite/g++.dg/tree-ssa/pr93667.C new file mode 100644 index 00000000000..d875f53d9ec @@ -275,20 +247,6 @@ Subject: [PATCH 0413/2034] SRA: Total scalarization after access propagation 5 files changed, 537 insertions(+), 184 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr92706-2.c -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 16247a59304..61da54df346 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 05518848829..38758207989 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/gcc.dg/guality/pr59776.c b/gcc/testsuite/gcc.dg/guality/pr59776.c index 382abb622bb..6c1c8165b70 100644 --- a/gcc/testsuite/gcc.dg/guality/pr59776.c @@ -333,13 +291,6 @@ Subject: [PATCH 0334/2034] Do not generate a unique fnname for resolver. gcc/testsuite/gcc.target/i386/pr81213.c | 4 ++-- 4 files changed, 19 insertions(+), 17 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 45075840824..59806baa757 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c index e580b26b995..b49e6f8d408 100644 --- a/gcc/config/i386/i386-features.c @@ -347,13 +298,6 @@ index e580b26b995..b49e6f8d408 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 2de060843d9..22a37dd1ab2 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/gcc.target/i386/pr81213.c b/gcc/testsuite/gcc.target/i386/pr81213.c index 13e15d5fef0..89c47529861 100644 --- a/gcc/testsuite/gcc.target/i386/pr81213.c @@ -396,13 +340,6 @@ Co-Authored-By: Jakub Jelinek 8 files changed, 142 insertions(+), 22 deletions(-) create mode 100644 gcc/testsuite/g++.dg/pr94314-4.C -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 74dbeeb44c6..9e499ec9c86 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c index c73b8f810f0..8f541a28b6e 100644 --- a/gcc/cgraphclones.c @@ -410,13 +347,6 @@ index c73b8f810f0..8f541a28b6e 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 756f1d759e6..94d2312022d 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/g++.dg/pr94314-2.C b/gcc/testsuite/g++.dg/pr94314-2.C index 36b93ed6d4d..998ce601767 100644 --- a/gcc/testsuite/g++.dg/pr94314-2.C @@ -492,13 +422,6 @@ https://gcc.gnu.org/ml/gcc-patches/2020-01/msg00809.html 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/pr90916.C -diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog -index 004ce0fdcdf..3cc7c48b490 100644 ---- a/gcc/cp/ChangeLog -+++ b/gcc/cp/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index fa82ecad233..4fdc74f9ca8 100644 --- a/gcc/cp/pt.c @@ -539,13 +462,6 @@ not broken, but this is both safer and satisfies static analysis. libgomp/plugin/plugin-gcn.c | 8 ++++++++ 2 files changed, 17 insertions(+) -diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog -index c524abbbfb6..ee1764d4ae3 100644 ---- a/libgomp/ChangeLog -+++ b/libgomp/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index dc72c90962c..4c6a4c03b6e 100644 --- a/libgomp/plugin/plugin-gcn.c @@ -578,13 +494,6 @@ ChangeLog: gcc/tree-into-ssa.c | 59 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 12 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 8c17e5992d2..262f0d6506f 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c index c27bf2ce121..6528acac31a 100644 --- a/gcc/tree-into-ssa.c @@ -683,13 +592,6 @@ just the C-family ones that defined a forwarding macro. 17 files changed, 146 insertions(+), 95 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp/pr80005.C -diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog -index 09ba2c8b40f..fdddb98a74d 100644 ---- a/gcc/c-family/ChangeLog -+++ b/gcc/c-family/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index a6308921dc9..70a12055e27 100644 --- a/gcc/c-family/c-cppbuiltin.c @@ -697,13 +599,6 @@ index a6308921dc9..70a12055e27 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index a526e32ac89..67d5f2e9e28 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/g++.dg/cpp/pr80005.C b/gcc/testsuite/g++.dg/cpp/pr80005.C new file mode 100644 index 00000000000..cc752616782 @@ -732,13 +627,6 @@ index dd15cd6af3c..82fd602f9f1 100644 @@ -1 +1,2 @@ + -diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog -index 3249b93fe88..27a841bbdce 100644 ---- a/libcpp/ChangeLog -+++ b/libcpp/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/libcpp/directives.c b/libcpp/directives.c index 983206a5838..10735c8c668 100644 --- a/libcpp/directives.c @@ -825,13 +713,6 @@ Subject: [PATCH 0004/2034] tree-opt: Fix bootstrap failure in gcc/tree-ssa-forwprop.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index a195863212e..f7df07343d1 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index aac31d02b6c..56c470f6ecf 100644 --- a/gcc/tree-ssa-forwprop.c @@ -898,13 +779,6 @@ Subject: [PATCH 0735/2034] PR 87488: Add --with-diagnostics-urls configuration gcc/pretty-print.h | 5 +- 11 files changed, 328 insertions(+), 26 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index e6eb6ab4c21..22f990a3088 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config.in b/gcc/config.in index 48292861842..01fb18dbbb5 100644 --- a/gcc/config.in @@ -1000,13 +874,6 @@ gcc/ChangeLog gcc/cfgloopanal.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 07e5bebe909..f3301b16464 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c index 392b1c337c4..0b33e8272a7 100644 --- a/gcc/cfgloopanal.c @@ -1073,13 +940,6 @@ Subject: [PATCH 0735/2034] PR 87488: Add --with-diagnostics-urls configuration gcc/pretty-print.h | 5 +- 11 files changed, 328 insertions(+), 26 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index e6eb6ab4c21..22f990a3088 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config.in b/gcc/config.in index 48292861842..01fb18dbbb5 100644 --- a/gcc/config.in @@ -1187,13 +1047,6 @@ co-authored-by: John Miller2 8 files changed, 142 insertions(+), 22 deletions(-) create mode 100644 gcc/testsuite/g++.dg/pr94314-4.C -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 74dbeeb44c6..9e499ec9c86 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c index c73b8f810f0..8f541a28b6e 100644 --- a/gcc/cgraphclones.c @@ -1201,13 +1054,6 @@ index c73b8f810f0..8f541a28b6e 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 756f1d759e6..94d2312022d 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/g++.dg/pr94314-2.C b/gcc/testsuite/g++.dg/pr94314-2.C index 36b93ed6d4d..998ce601767 100644 --- a/gcc/testsuite/g++.dg/pr94314-2.C @@ -1299,13 +1145,6 @@ if it isn't a REG or SUBREG of REG. 4 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr94291.c -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index a1ab9fb4ef3..12803e90b0a 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/combine.c b/gcc/combine.c index 58366a6d331..cff76cd3303 100644 --- a/gcc/combine.c @@ -1313,13 +1152,6 @@ index 58366a6d331..cff76cd3303 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 71b5a14bcbe..3cbf891d58d 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/gcc.dg/pr94291.c b/gcc/testsuite/gcc.dg/pr94291.c new file mode 100644 index 00000000000..7daa2b01166 @@ -1390,13 +1222,6 @@ index e85a8e8813e..fb776ba5a0e 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog -index c429b49e68c..69ea1fdc4f3 100644 ---- a/gcc/c-family/ChangeLog -+++ b/gcc/c-family/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c index ac936d5bbbb..a101312c581 100644 --- a/gcc/c-family/c-attribs.c @@ -1432,10 +1257,122 @@ index c212a1a57dc..3dccef39701 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 176aa117904..185f9ea725e 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog +diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-error-1.c b/gcc/testsuite/c-c++-common/patchable_function_entry-error-1.c +new file mode 100644 +index 00000000000..f60bf46cfe3 +--- /dev/null ++++ b/gcc/testsuite/c-c++-common/patchable_function_entry-error-1.c +@@ -0,0 +1 @@ ++ +diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-error-2.c b/gcc/testsuite/c-c++-common/patchable_function_entry-error-2.c +new file mode 100644 +index 00000000000..90f88c78be7 +--- /dev/null ++++ b/gcc/testsuite/c-c++-common/patchable_function_entry-error-2.c +@@ -0,0 +1 @@ ++ +diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-error-3.c b/gcc/testsuite/c-c++-common/patchable_function_entry-error-3.c +new file mode 100644 +index 00000000000..4490e5c15ca +--- /dev/null ++++ b/gcc/testsuite/c-c++-common/patchable_function_entry-error-3.c +@@ -0,0 +1 @@ ++ +diff --git a/gcc/varasm.c b/gcc/varasm.c +index 271a67abf56..f062e48071f 100644 +--- a/gcc/varasm.c ++++ b/gcc/varasm.c +@@ -1 +1,2 @@ + ++ +-- +2.26.2 + +=== 0002-Add-patch_area_size-and-patch_area_entry-to-crtl.patch === +From 6607bdd99994c834f92fce924abdaea3405f62dc Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Fri, 1 May 2020 21:03:10 -0700 +Subject: [PATCH] Add patch_area_size and patch_area_entry to crtl + +Currently patchable area is at the wrong place. It is placed immediately +after function label and before .cfi_startproc. A backend should be able +to add a pseudo patchable area instruction durectly into RTL. This patch +adds patch_area_size and patch_area_entry to crtl so that the patchable +area info is available in RTL passes. + +It also limits patch_area_size and patch_area_entry to 65535, which is +a reasonable maximum size for patchable area. + +gcc/ + + PR target/93492 + * cfgexpand.c (pass_expand::execute): Set crtl->patch_area_size + and crtl->patch_area_entry. + * emit-rtl.h (rtl_data): Add patch_area_size and patch_area_entry. + * opts.c (common_handle_option): Limit + function_entry_patch_area_size and function_entry_patch_area_start + to USHRT_MAX. Fix a typo in error message. + * varasm.c (assemble_start_function): Use crtl->patch_area_size + and crtl->patch_area_entry. + * doc/invoke.texi: Document the maximum value for + -fpatchable-function-entry. + +gcc/c-family/ + + PR target/12345 + * c-attribs.c (handle_patchable_function_entry_attribute): Limit + value to USHRT_MAX (65535). + +--- + gcc/ChangeLog | 14 ++++++++ + gcc/c-family/ChangeLog | 6 ++++ + gcc/c-family/c-attribs.c | 9 +++++ + gcc/cfgexpand.c | 33 +++++++++++++++++++ + gcc/doc/invoke.texi | 1 + + gcc/emit-rtl.h | 6 ++++ + gcc/opts.c | 4 ++- + gcc/testsuite/ChangeLog | 7 ++++ + .../patchable_function_entry-error-1.c | 9 +++++ + .../patchable_function_entry-error-2.c | 9 +++++ + .../patchable_function_entry-error-3.c | 17 ++++++++++ + gcc/varasm.c | 30 ++--------------- + 12 files changed, 116 insertions(+), 29 deletions(-) + create mode 100644 gcc/testsuite/c-c++-common/patchable_function_entry-error-1.c + create mode 100644 gcc/testsuite/c-c++-common/patchable_function_entry-error-2.c + create mode 100644 gcc/testsuite/c-c++-common/patchable_function_entry-error-3.c + +diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c +index ac936d5bbbb..a101312c581 100644 +--- a/gcc/c-family/c-attribs.c ++++ b/gcc/c-family/c-attribs.c +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c +index a7ec77d5c85..86efa22bf60 100644 +--- a/gcc/cfgexpand.c ++++ b/gcc/cfgexpand.c +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 527d362533a..767d1f07801 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/emit-rtl.h b/gcc/emit-rtl.h +index a878efe3cf7..3d6565c8a30 100644 +--- a/gcc/emit-rtl.h ++++ b/gcc/emit-rtl.h +@@ -1 +1,2 @@ + ++ +diff --git a/gcc/opts.c b/gcc/opts.c +index c212a1a57dc..3dccef39701 100644 +--- a/gcc/opts.c ++++ b/gcc/opts.c @@ -1 +1,2 @@ + @@ -1497,13 +1434,6 @@ gcc/cp/ChangeLog 3 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/lambda-generic-variadic20.C -diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog -index 640e4948130..4b6691a77f0 100644 ---- a/gcc/cp/ChangeLog -+++ b/gcc/cp/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7bf249cee5c..2fe7b66707c 100644 --- a/gcc/cp/pt.c @@ -1539,13 +1469,6 @@ concepts. 3 files changed, 11 insertions(+) create mode 100644 gcc/testsuite/g++.dg/concepts/fn-concept3.C -diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog -index 59646c70fa4..4729e3d331d 100644 ---- a/gcc/cp/ChangeLog -+++ b/gcc/cp/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cp/except.c b/gcc/cp/except.c index e073bd4d2bc..55b4b6af442 100644 --- a/gcc/cp/except.c @@ -1573,13 +1496,6 @@ Subject: [PATCH 0129/2034] Add PR number to change log gcc/ChangeLog | 1 + 1 file changed, 1 insertion(+) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 6c6d586ca75..49ca5f92dec 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ -- 2.26.1 @@ -1616,13 +1532,6 @@ gcc/testsuite/ 6 files changed, 132 insertions(+) create mode 100644 gcc/testsuite/gcc.target/aarch64/movk_2.c -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index efbbbf08225..cea8ffee99c 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h index 24cc65a383a..d29975a8921 100644 --- a/gcc/config/aarch64/aarch64-protos.h @@ -1644,13 +1553,6 @@ index 90eebce85c0..9c1f17d0f85 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 601bc336290..cdb26581b9c 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/gcc.target/aarch64/movk_2.c b/gcc/testsuite/gcc.target/aarch64/movk_2.c new file mode 100644 index 00000000000..a0477ad5d42 @@ -1836,13 +1738,6 @@ already). gcc/testsuite/g++.dg/tree-ssa/pr27830.C | 2 ++ 4 files changed, 47 insertions(+), 5 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 06f7eda0033..93c3076eb86 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c index e08621ace27..a9ae7ab70ca 100644 --- a/gcc/config/rs6000/rs6000-call.c @@ -1850,13 +1745,6 @@ index e08621ace27..a9ae7ab70ca 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 684e408c1a5..245c1512c76 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr27830.C b/gcc/testsuite/g++.dg/tree-ssa/pr27830.C index 01c7fc18783..551ebc428cd 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr27830.C @@ -1969,13 +1857,6 @@ index c212a1a57dc..3dccef39701 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 176aa117904..185f9ea725e 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-error-1.c b/gcc/testsuite/c-c++-common/patchable_function_entry-error-1.c new file mode 100644 index 00000000000..f60bf46cfe3 @@ -2082,13 +1963,6 @@ Subject: [PATCH 0004/2034] tree-opt: Fix bootstrap failure in gcc/tree-ssa-forwprop.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index a195863212e..f7df07343d1 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index aac31d02b6c..56c470f6ecf 100644 --- a/gcc/tree-ssa-forwprop.c @@ -2125,13 +1999,6 @@ gcc/testsuite/ChangeLog: 3 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/g++.dg/ext/is_constructible4.C -diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog -index 3ca5d7a11b4..c37e461bcc5 100644 ---- a/gcc/cp/ChangeLog -+++ b/gcc/cp/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9bb8cc13e5f..872f8ff8f52 100644 --- a/gcc/cp/pt.c @@ -2210,13 +2077,6 @@ Subject: [PATCH 0043/2034] Compare TREE_ADDRESSABLE and TYPE_MODE when ODR create mode 100644 gcc/testsuite/g++.dg/lto/odr-8_0.C create mode 100644 gcc/testsuite/g++.dg/lto/odr-8_1.C -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 38165123654..33ca91a6467 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index f0031957375..b609a77701d 100644 --- a/gcc/ipa-devirt.c @@ -2224,13 +2084,6 @@ index f0031957375..b609a77701d 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 8e3b9105188..dc42601794b 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/g++.dg/lto/odr-8_0.C b/gcc/testsuite/g++.dg/lto/odr-8_0.C new file mode 100644 index 00000000000..59f51399fac @@ -2302,13 +2155,6 @@ gcc/testsuite/ChangeLog: create mode 100755 gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-3.c create mode 100755 gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-4.c -diff --git a/gcc/ChangeLog b/gcc/ChangeLog -index 9a949980699..49dcecb6777 100644 ---- a/gcc/ChangeLog -+++ b/gcc/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c index f0e0461b7f0..f50c4857e1c 100644 --- a/gcc/config/aarch64/aarch64-builtins.c @@ -2344,13 +2190,6 @@ index b9843b83c5f..83720d9802a 100644 @@ -1 +1,2 @@ + -diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog -index 0d8aa6063a7..8b01aa06a40 100644 ---- a/gcc/testsuite/ChangeLog -+++ b/gcc/testsuite/ChangeLog -@@ -1 +1,2 @@ - -+ diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vdot-3-1.c new file mode 100755 index 00000000000..ac4f821e771 @@ -3408,14 +3247,6 @@ Subject: [PATCH] Fix a changelog. gcc/ChangeLog-2020 | 1 + 1 file changed, 1 insertion(+) -diff --git a/gcc/ChangeLog-2020 b/gcc/ChangeLog-2020 -index 6553720acad..2c170ef014a 100644 ---- a/gcc/ChangeLog-2020 -+++ b/gcc/ChangeLog-2020 -@@ -1 +1,2 @@ - -+ - -- 2.29.2 === 0001-Add-macro.patch === -- cgit v1.1 From 814d86ddced44318c4195052ab7c4f227771bb76 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 11 Mar 2021 16:23:56 +0100 Subject: Remove libhsail-rt. ChangeLog: * Makefile.def: Remove libhsail-rt. * Makefile.in: Likewise. * configure.ac: Likewise. * configure: Regenerate. * libhsail-rt/ChangeLog: Removed. * libhsail-rt/Makefile.am: Removed. * libhsail-rt/Makefile.in: Removed. * libhsail-rt/README: Removed. * libhsail-rt/aclocal.m4: Removed. * libhsail-rt/configure: Removed. * libhsail-rt/configure.ac: Removed. * libhsail-rt/configure.tgt: Removed. * libhsail-rt/include/internal/fibers.h: Removed. * libhsail-rt/include/internal/phsa-queue-interface.h: Removed. * libhsail-rt/include/internal/phsa-rt.h: Removed. * libhsail-rt/include/internal/workitems.h: Removed. * libhsail-rt/rt/arithmetic.c: Removed. * libhsail-rt/rt/atomics.c: Removed. * libhsail-rt/rt/bitstring.c: Removed. * libhsail-rt/rt/fbarrier.c: Removed. * libhsail-rt/rt/fibers.c: Removed. * libhsail-rt/rt/fp16.c: Removed. * libhsail-rt/rt/misc.c: Removed. * libhsail-rt/rt/multimedia.c: Removed. * libhsail-rt/rt/queue.c: Removed. * libhsail-rt/rt/sat_arithmetic.c: Removed. * libhsail-rt/rt/segment.c: Removed. * libhsail-rt/rt/workitems.c: Removed. * libhsail-rt/target-config.h.in: Removed. contrib/ChangeLog: * gcc_update: Remove libhsail-rt folder. * update-copyright.py: Likewise. --- contrib/gcc_update | 4 ---- contrib/update-copyright.py | 2 -- 2 files changed, 6 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc_update b/contrib/gcc_update index 04dc490..80fac9f 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -141,10 +141,6 @@ libgomp/testsuite/Makefile.in: libgomp/testsuite/Makefile.am libgomp/aclocal.m4 libgomp/configure.ac: libgomp/plugin/configfrag.ac libgomp/configure: libgomp/configure.ac libgomp/aclocal.m4 libgomp/config.h.in: libgomp/configure.ac libgomp/aclocal.m4 -libhsail-rt/aclocal.m4: libhsail-rt/configure.ac -libhsail-rt/Makefile.in: libhsail-rt/Makefile.am libhsail-rt/aclocal.m4 -libhsail-rt/configure: libhsail-rt/configure.ac libhsail-rt/aclocal.m4 -libhsail-rt/target-config.h.in: libhsail-rt/configure.ac libhsail-rt/aclocal.m4 libitm/aclocal.m4: libitm/configure.ac libitm/acinclude.m4 libitm/Makefile.in: libitm/Makefile.am libitm/aclocal.m4 libitm/testsuite/Makefile.in: libitm/testsuite/Makefile.am libitm/aclocal.m4 diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py index 5603b8e..83c761a 100755 --- a/contrib/update-copyright.py +++ b/contrib/update-copyright.py @@ -755,7 +755,6 @@ class GCCCmdLine (CmdLine): self.add_dir ('libgfortran') # libgo is imported from upstream. self.add_dir ('libgomp') - self.add_dir ('libhsail-rt') self.add_dir ('libiberty') self.add_dir ('libitm') self.add_dir ('libobjc') @@ -782,7 +781,6 @@ class GCCCmdLine (CmdLine): 'libgcc', 'libgfortran', 'libgomp', - 'libhsail-rt', 'libiberty', 'libitm', 'libobjc', -- cgit v1.1 From 5caadfbde2c0d4cb97db23bab74b52c56bb1be9e Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 12 May 2021 10:37:12 +0200 Subject: gcc-changelog: respect branch in git_update_version.py. contrib/ChangeLog: * gcc-changelog/git_commit.py: Simplify needle lookup. * gcc-changelog/git_update_version.py: Pass ref_name to parse_git_revisions. --- contrib/gcc-changelog/git_commit.py | 2 +- contrib/gcc-changelog/git_update_version.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index c70279e..8f9b266 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -394,7 +394,7 @@ class GitCommit: self.changelog_locations = list(default_changelog_locations) if ref_name: version = sys.maxsize - if ref_name.startswith('refs/heads/releases/gcc-'): + if 'releases/gcc-' in ref_name: version = int(ref_name.split('-')[-1]) if version >= 12: # HSA and BRIG were removed in GCC 12 diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index 9bc41bb..0a21a74 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -78,7 +78,7 @@ repo = Repo(args.git_path) origin = repo.remotes['origin'] -def update_current_branch(): +def update_current_branch(ref_name): commit = repo.head.commit commit_count = 1 while commit: @@ -101,7 +101,7 @@ def update_current_branch(): if len(head.parents) == 2: head = head.parents[1] commits = parse_git_revisions(args.git_path, '%s..%s' - % (commit.hexsha, head.hexsha)) + % (commit.hexsha, head.hexsha), ref_name) commits = [c for c in commits if c.info.hexsha not in IGNORED_COMMITS] for git_commit in reversed(commits): prepend_to_changelog_files(repo, args.git_path, git_commit, @@ -145,6 +145,6 @@ else: branch.checkout() origin.pull(rebase=True) print('branch pulled and checked out') - update_current_branch() + update_current_branch(name) assert not repo.index.diff(None) print('branch is done\n', flush=True) -- cgit v1.1 From 037e36611108283a729d94a8ae15962995742886 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 12 May 2021 08:51:03 +0000 Subject: Daily bump. --- contrib/ChangeLog | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 2d6e29f..42e67d7 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,30 @@ +2021-05-12 Martin Liska + + * gcc-changelog/git_commit.py: Simplify needle lookup. + * gcc-changelog/git_update_version.py: Pass ref_name to + parse_git_revisions. + +2021-05-11 Martin Liska + + * gcc_update: Remove libhsail-rt folder. + * update-copyright.py: Likewise. + +2021-05-11 Martin Liska + + * gcc-changelog/git_check_commit.py: Remove --non-strict-mode. + * gcc-changelog/git_commit.py: Remove strict mode. + * gcc-changelog/git_email.py: Likewise. + * gcc-changelog/git_repository.py: Likewise. + * gcc-changelog/test_email.py: Likewise. + * gcc-changelog/test_patches.txt: Update patches so that they + don't contain a ChangeLog file changes. + +2021-05-11 Martin Liska + + * gcc-changelog/git_commit.py: Remove ChangeLog locations + based on ref_name. + * gcc-changelog/git_repository.py: Likewise. + 2021-05-10 Martin Liska * gcc-changelog/git_email.py: Remove newlines when --help -- cgit v1.1 From fef084dc83d38cad32604bb1cee4caf42ffeec12 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 13 May 2021 15:12:36 +0200 Subject: mklog: Put detected PR entries before ChangeLogs contrib/ChangeLog: * mklog.py: Put PR entries before all ChangeLog entries (will be added to all ChangeLog locations by Daily bump script). * test_mklog.py: Test the new behavior. --- contrib/mklog.py | 10 ++++++++-- contrib/test_mklog.py | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 1604f05..5c93c70 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -169,13 +169,19 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False): if fill_pr_titles: out += get_pr_titles(prs) + # print list of PR entries before ChangeLog entries + if prs: + if not out: + out += '\n' + for pr in prs: + out += '\t%s\n' % pr + out += '\n' + # sort ChangeLog so that 'testsuite' is at the end for changelog in sorted(changelog_list, key=lambda x: 'testsuite' in x): files = changelogs[changelog] out += '%s:\n' % os.path.join(changelog, 'ChangeLog') out += '\n' - for pr in prs: - out += '\t%s\n' % pr # new and deleted files should be at the end for file in sorted(files, key=sort_changelog_files): assert file.path.startswith(changelog) diff --git a/contrib/test_mklog.py b/contrib/test_mklog.py index 7e95ec1..a0670da 100755 --- a/contrib/test_mklog.py +++ b/contrib/test_mklog.py @@ -317,9 +317,10 @@ index 00000000000..dcc8999c446 EXPECTED5 = '''\ PR target/95046 - Vectorize V2SFmode operations + PR target/95046 + gcc/testsuite/ChangeLog: - PR target/95046 * gcc.target/i386/pr95046-6.c: New test. ''' @@ -377,9 +378,11 @@ index 00000000000..f3d6d11e61e ''' EXPECTED7 = '''\ -gcc/testsuite/ChangeLog: DR 2237 + +gcc/testsuite/ChangeLog: + * g++.dg/DRs/dr2237.C: New test. ''' -- cgit v1.1 From f9af11c7f156bede9aa28410073acbab7b0fa0fe Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Fri, 14 May 2021 00:16:30 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 42e67d7..f7c1e86 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-05-13 Martin Liska + + * mklog.py: Put PR entries before all ChangeLog entries + (will be added to all ChangeLog locations by Daily bump script). + * test_mklog.py: Test the new behavior. + 2021-05-12 Martin Liska * gcc-changelog/git_commit.py: Simplify needle lookup. -- cgit v1.1 From ae3e0b8bc204d1f6ce858c2637e1e72b636af3a2 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 14 May 2021 10:44:33 +0200 Subject: gcc-changelog: detect Co-Authored-By before ChangeLog entries contrib/ChangeLog: * gcc-changelog/git_commit.py: Support Co-Authored-By before a first ChangeLog entry. --- contrib/gcc-changelog/git_commit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 8f9b266..4958ab9 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -409,7 +409,8 @@ class GitCommit: continue if (changelog_regex.match(b) or self.find_changelog_location(b) or star_prefix_regex.match(b) or pr_regex.match(b) - or dr_regex.match(b) or author_line_regex.match(b)): + or dr_regex.match(b) or author_line_regex.match(b) + or b.lower().startswith(CO_AUTHORED_BY_PREFIX)): self.changes = body[i:] return if not all_are_ignored: -- cgit v1.1 From df18a1343ddecebb364509a518c7b85eb32297b6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 14 May 2021 11:24:08 +0200 Subject: Closing of 8 branch. 2021-05-14 Jakub Jelinek contrib/ * gcc-changelog/git_update_version.py: Remove releases/gcc-8 from active_refs. maintainer-scripts/ * crontab: Stop doing gcc-8 snapshots. --- contrib/gcc-changelog/git_update_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index 0a21a74..0508f19 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -57,7 +57,7 @@ def prepend_to_changelog_files(repo, folder, git_commit, add_to_git): repo.git.add(full_path) -active_refs = ['master', 'releases/gcc-8', 'releases/gcc-9', 'releases/gcc-10', +active_refs = ['master', 'releases/gcc-9', 'releases/gcc-10', 'releases/gcc-11'] parser = argparse.ArgumentParser(description='Update DATESTAMP and generate ' -- cgit v1.1 From fe108dad32f521c4f924a397f11c63f86519e183 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 14 May 2021 12:00:19 +0200 Subject: download_prerequisites: update MPFR version to recommended contrib/ChangeLog: * download_prerequisites: Use version 4.1.0. --- contrib/download_prerequisites | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites index 7d0c4b5..5184fae 100755 --- a/contrib/download_prerequisites +++ b/contrib/download_prerequisites @@ -28,7 +28,7 @@ version='(unversioned)' # `contrib/prerequisites.md5` with the new checksums. gmp='gmp-6.1.0.tar.bz2' -mpfr='mpfr-3.1.4.tar.bz2' +mpfr='mpfr-4.1.0.tar.bz2' mpc='mpc-1.0.3.tar.gz' isl='isl-0.18.tar.bz2' -- cgit v1.1 From 87a7d10c2e9ec34a276e6acb5d2282a35b9cfafb Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Sat, 15 May 2021 00:16:27 +0000 Subject: Daily bump. --- contrib/ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index f7c1e86..8e393b7 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,17 @@ +2021-05-14 Martin Liska + + * download_prerequisites: Use version 4.1.0. + +2021-05-14 Jakub Jelinek + + * gcc-changelog/git_update_version.py: Remove releases/gcc-8 from + active_refs. + +2021-05-14 Martin Liska + + * gcc-changelog/git_commit.py: Support Co-Authored-By before + a first ChangeLog entry. + 2021-05-13 Martin Liska * mklog.py: Put PR entries before all ChangeLog entries -- cgit v1.1 From 52a812098a7c05adb2bc3c2ac531039cfc702e94 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 17 May 2021 08:45:10 +0200 Subject: Revert "download_prerequisites: update MPFR version to recommended" This reverts commit fe108dad32f521c4f924a397f11c63f86519e183. --- contrib/download_prerequisites | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites index 5184fae..7d0c4b5 100755 --- a/contrib/download_prerequisites +++ b/contrib/download_prerequisites @@ -28,7 +28,7 @@ version='(unversioned)' # `contrib/prerequisites.md5` with the new checksums. gmp='gmp-6.1.0.tar.bz2' -mpfr='mpfr-4.1.0.tar.bz2' +mpfr='mpfr-3.1.4.tar.bz2' mpc='mpc-1.0.3.tar.gz' isl='isl-0.18.tar.bz2' -- cgit v1.1 From 2ec80a3457a1be57736a70007d4851e676bce7e8 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 17 May 2021 08:51:03 +0200 Subject: Update mpfr version to 3.1.6 This updates the mpfr version to 3.1.6 which is the last bugfix release from the 3.1.x series and avoids printing the version is buggy but acceptable from our configury. 2021-05-17 Richard Biener contrib/ChangeLog: * download_prerequisites: Update mpfr version to 3.1.6. * prerequisites.md5: Update. * prerequisites.sha512: Likewise. --- contrib/download_prerequisites | 2 +- contrib/prerequisites.md5 | 2 +- contrib/prerequisites.sha512 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites index 7d0c4b5..51e715f 100755 --- a/contrib/download_prerequisites +++ b/contrib/download_prerequisites @@ -28,7 +28,7 @@ version='(unversioned)' # `contrib/prerequisites.md5` with the new checksums. gmp='gmp-6.1.0.tar.bz2' -mpfr='mpfr-3.1.4.tar.bz2' +mpfr='mpfr-3.1.6.tar.bz2' mpc='mpc-1.0.3.tar.gz' isl='isl-0.18.tar.bz2' diff --git a/contrib/prerequisites.md5 b/contrib/prerequisites.md5 index cc71e0f..272f7a4 100644 --- a/contrib/prerequisites.md5 +++ b/contrib/prerequisites.md5 @@ -1,4 +1,4 @@ 86ee6e54ebfc4a90b643a65e402c4048 gmp-6.1.0.tar.bz2 -b8a2f6b0e68bef46e53da2ac439e1cf4 mpfr-3.1.4.tar.bz2 +320c28198def956aeacdb240b46b8969 mpfr-3.1.6.tar.bz2 d6a1d5f8ddea3abd2cc3e98f58352d26 mpc-1.0.3.tar.gz 11436d6b205e516635b666090b94ab32 isl-0.18.tar.bz2 diff --git a/contrib/prerequisites.sha512 b/contrib/prerequisites.sha512 index cf6b93b..7160145 100644 --- a/contrib/prerequisites.sha512 +++ b/contrib/prerequisites.sha512 @@ -1,4 +1,4 @@ 3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117 gmp-6.1.0.tar.bz2 -51066066ff2c12ed2198605ecf68846b0c96b548adafa5b80e0c786d0df488411a5e8973358fce7192dc977ad4e68414cf14500e3c39746de62465eb145bb819 mpfr-3.1.4.tar.bz2 +0c310dd7956be527884f8059c195a5aca1042b089d0927ac6341e6310b1250a7059bc61aaaab4dfb76c6ab8b67e440878ca203f72674529bbcb46770ed9b6885 mpfr-3.1.6.tar.bz2 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43 mpc-1.0.3.tar.gz 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94 isl-0.18.tar.bz2 -- cgit v1.1 From a7ffc1ef6e38c01037c8894a6bc1889d6f875444 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 18 May 2021 00:16:40 +0000 Subject: Daily bump. --- contrib/ChangeLog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 8e393b7..b97710f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,16 @@ +2021-05-17 Richard Biener + + * download_prerequisites: Update mpfr version to 3.1.6. + * prerequisites.md5: Update. + * prerequisites.sha512: Likewise. + +2021-05-17 Richard Biener + + Revert: + 2021-05-14 Martin Liska + + * download_prerequisites: Use version 4.1.0. + 2021-05-14 Martin Liska * download_prerequisites: Use version 4.1.0. -- cgit v1.1 From 7b4bae0acb14a1076df3234e905442bbdf9503dd Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 18 May 2021 10:08:50 +0100 Subject: gcc-changelog: Remove use of non-strict mode contrib/ChangeLog: * gcc-changelog/git_email.py: Remove use of non-strict mode. --- contrib/gcc-changelog/git_email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index 6933e3d..fa62e3a 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -110,7 +110,7 @@ if __name__ == '__main__': print() print('Successfully parsed: %d/%d' % (success, len(allfiles))) else: - email = GitEmail(sys.argv[1], False) + email = GitEmail(sys.argv[1]) if email.success: print('OK') email.print_output() -- cgit v1.1 From a8daf9a19a5eae6b98acede14bb6c27b2e0038e0 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 19 May 2021 00:16:45 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index b97710f..0b4cf14 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-05-18 Jonathan Wakely + + * gcc-changelog/git_email.py: Remove use of non-strict mode. + 2021-05-17 Richard Biener * download_prerequisites: Update mpfr version to 3.1.6. -- cgit v1.1 From 9d38e096c5e3b1c2233b28d0e6ff8ee81517af56 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 24 May 2021 09:16:01 +0200 Subject: gcc-changelog: Add note about ChangeLog entries contrib/ChangeLog: * gcc-changelog/git_commit.py: Add note that ChangeLog entries are added automatically. * gcc-changelog/test_email.py: Update test. --- contrib/gcc-changelog/git_commit.py | 8 +++++--- contrib/gcc-changelog/test_email.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 4958ab9..bd8c1ff 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -326,9 +326,11 @@ class GitCommit: # All modified files are only MISC files return elif project_files: - self.errors.append(Error('ChangeLog, DATESTAMP, BASE-VER and ' - 'DEV-PHASE updates should be done ' - 'separately from normal commits')) + err = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates ' \ + 'should be done separately from normal commits\n' \ + '(note: ChangeLog entries will be automatically ' \ + 'added by a cron job)' + self.errors.append(Error(err)) return all_are_ignored = (len(project_files) + len(ignored_files) diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 7472762..6d65963 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -258,7 +258,7 @@ class TestGccChangelog(unittest.TestCase): email = self.from_patch_glob('0001-Add-patch_are') msg = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates should ' \ 'be done separately from normal commits' - assert email.errors[0].message == msg + assert email.errors[0].message.startswith(msg) def test_strict_mode_normal_patch(self): email = self.get_git_email('0001-Just-test-it.patch') -- cgit v1.1 From 637569df03507cfd603d0979652b0a936d9b122d Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 25 May 2021 00:16:53 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 0b4cf14..0498c0f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-05-24 Martin Liska + + * gcc-changelog/git_commit.py: Add note that ChangeLog entries + are added automatically. + * gcc-changelog/test_email.py: Update test. + 2021-05-18 Jonathan Wakely * gcc-changelog/git_email.py: Remove use of non-strict mode. -- cgit v1.1 From c9a089cad157231089c20402f5b762db897e5c0f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 25 May 2021 11:11:02 +0200 Subject: Update copyright years in c++tools While looking at PR100731, I have noticed the copyright years are 2020-ish only. This patch adds it to update-copyright.py and updates those. 2021-05-25 Jakub Jelinek contrib/ * update-copyright.py: Add c++tools. c++tools/ * Makefile.in: Update copyright year. * configure.ac: Likewise. * resolver.cc: Likewise. * resolver.h: Likewise. * server.cc: Likewise. (print_version): Update copyright notice date. --- contrib/update-copyright.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contrib') diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py index 83c761a..2b2bb11 100755 --- a/contrib/update-copyright.py +++ b/contrib/update-copyright.py @@ -735,6 +735,7 @@ class GCCCmdLine (CmdLine): self.add_dir ('.', TopLevelFilter()) # boehm-gc is imported from upstream. + self.add_dir ('c++tools') self.add_dir ('config', ConfigFilter()) # contrib isn't really part of GCC. self.add_dir ('fixincludes') @@ -770,6 +771,7 @@ class GCCCmdLine (CmdLine): # zlib is imported from upstream. self.default_dirs = [ + 'c++tools', 'gcc', 'include', 'libada', -- cgit v1.1 From 2bc6dacecb2ba60f1f06f310c6887a26b09cdba8 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 26 May 2021 00:16:41 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 0498c0f..a07fc19 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-05-25 Jakub Jelinek + + * update-copyright.py: Add c++tools. + 2021-05-24 Martin Liska * gcc-changelog/git_commit.py: Add note that ChangeLog entries -- cgit v1.1 From e01874cdae4bfdb1d5c5e25c54f14225c5895af3 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 11 Jun 2021 10:13:54 +0200 Subject: gcc-changelog: Ignore one more commit. contrib/ChangeLog: * gcc-changelog/git_update_version.py: Ignore commit that violates rules and was somehow pushed. --- contrib/gcc-changelog/git_update_version.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index 0508f19..b97ca58 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -27,7 +27,9 @@ from git_repository import parse_git_revisions current_timestamp = datetime.datetime.now().strftime('%Y%m%d\n') # Skip the following commits, they cannot be correctly processed -IGNORED_COMMITS = ('c2be82058fb40f3ae891c68d185ff53e07f14f45') +IGNORED_COMMITS = ( + 'c2be82058fb40f3ae891c68d185ff53e07f14f45', + '04a040d907a83af54e0a98bdba5bfabc0ef4f700') def read_timestamp(path): -- cgit v1.1 From 43c35d0d90214171bd037741d525a0fde73b7755 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Fri, 11 Jun 2021 09:09:28 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index a07fc19..da7d4d5 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-06-11 Martin Liska + + * gcc-changelog/git_update_version.py: Ignore commit that + violates rules and was somehow pushed. + 2021-05-25 Jakub Jelinek * update-copyright.py: Add c++tools. -- cgit v1.1 From d554f43c98eb07f222afef5e90b5582d65519f7e Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Sun, 13 Jun 2021 07:46:54 +0200 Subject: contrib/gcc-changelog: Check that PR in subject is in changelog This patch checks that a '[PRnnnn]' and '(PRnnnn)' also appears as PR in the changelog part of the commit message. And it does likewise for 'PR comp/nnnn' except that then also the component name is checked. (Note that the reverse is permitted, i.e. PR(s) only appearing in the changelog.) To avoid false positives, PR numbers in the subject line are ignored, if 'revert' appears. Additionally, reject commits with a nonempty second line. contrib/ChangeLog: * gcc-changelog/git_commit.py (pr_regex): Add ?P for group('pr'). (subject_pr_regex, subject_pr2_regex): New. (GitInfo.__init__, GitCommit.parse_changelog): Check subject PRs. * gcc-changelog/git_email.py (SUBJECT_PREFIX, subject_patch_regex): New. (GitEmail.__init__): Parse 'Subject:' and pass it to GitInfo. * gcc-changelog/test_email.py (test_pr_only_in_subject, test_wrong_pr_comp_in_subject, test_copyright_years): New. * gcc-changelog/test_patches.txt (0030-PR-c-92746, pr-check1.patch): Update to avoid triggering the new check. (0001-rs6000-Support-doubleword, pr-wrong-comp.patch, copyright-years.patch): New. --- contrib/gcc-changelog/git_commit.py | 30 +++++++++++++++-- contrib/gcc-changelog/git_email.py | 22 +++++++++++-- contrib/gcc-changelog/test_email.py | 13 ++++++++ contrib/gcc-changelog/test_patches.txt | 60 +++++++++++++++++++++++++++++++++- 4 files changed, 120 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index bd8c1ff..d1646bd 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -156,7 +156,9 @@ author_line_regex = \ re.compile(r'^(?P\d{4}-\d{2}-\d{2})\ {2}(?P.* <.*>)') additional_author_regex = re.compile(r'^\t(?P\ *)?(?P.* <.*>)') changelog_regex = re.compile(r'^(?:[fF]or +)?([a-z0-9+-/]*)ChangeLog:?') -pr_regex = re.compile(r'\tPR (?P[a-z+-]+\/)?([0-9]+)$') +subject_pr_regex = re.compile(r'(^|\W)PR\s+(?P[a-zA-Z+-]+)/(?P\d{4,7})') +subject_pr2_regex = re.compile(r'[(\[]PR\s*(?P\d{4,7})[)\]]') +pr_regex = re.compile(r'\tPR (?P[a-z+-]+\/)?(?P[0-9]+)$') dr_regex = re.compile(r'\tDR ([0-9]+)$') star_prefix_regex = re.compile(r'\t\*(?P\ *)(?P.*)') end_of_location_regex = re.compile(r'[\[<(:]') @@ -298,6 +300,7 @@ class GitCommit: self.top_level_authors = [] self.co_authors = [] self.top_level_prs = [] + self.subject_prs = set() self.cherry_pick_commit = None self.revert_commit = None self.commit_to_info_hook = commit_to_info_hook @@ -307,6 +310,9 @@ class GitCommit: if self.info.lines and self.info.lines[0] == 'Update copyright years.': return + if self.info.lines and len(self.info.lines) > 1 and self.info.lines[1]: + self.errors.append(Error('Expected empty second line in commit message', info.lines[0])) + # Identify first if the commit is a Revert commit for line in self.info.lines: m = revert_regex.match(line) @@ -316,6 +322,19 @@ class GitCommit: if self.revert_commit: self.info = self.commit_to_info_hook(self.revert_commit) + # The following happens for get_email.py: + if not self.info: + return + + # Extract PR numbers form the subject line + # Match either [PRnnnn] / (PRnnnn) or PR component/nnnn + if self.info.lines and not self.revert_commit: + self.subject_prs = {m.group('pr') for m in subject_pr2_regex.finditer(info.lines[0])} + for m in subject_pr_regex.finditer(info.lines[0]): + if not m.group('component') in bug_components: + self.errors.append(Error('invalid PR component in subject', info.lines[0])) + self.subject_prs.add(m.group('pr')) + # Allow complete deletion of ChangeLog files in a commit project_files = [f for f in self.info.modified_files if (self.is_changelog_filename(f[0], allow_suffix=True) and f[1] != 'D') @@ -346,6 +365,9 @@ class GitCommit: if not self.errors: self.check_mentioned_files() self.check_for_correct_changelog() + if self.subject_prs: + self.errors.append(Error('PR %s in subject but not in changelog' % + ', '.join(self.subject_prs), self.info.lines[0])) @property def success(self): @@ -460,7 +482,9 @@ class GitCommit: else: author_tuple = (m.group('name'), None) elif pr_regex.match(line): - component = pr_regex.match(line).group('component') + m = pr_regex.match(line) + component = m.group('component') + pr = m.group('pr') if not component: self.errors.append(Error('missing PR component', line)) continue @@ -469,6 +493,8 @@ class GitCommit: continue else: pr_line = line.lstrip() + if pr in self.subject_prs: + self.subject_prs.remove(pr) elif dr_regex.match(line): pr_line = line.lstrip() diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index fa62e3a..87b419c 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -17,6 +17,7 @@ # . */ import os +import re import sys from itertools import takewhile @@ -28,6 +29,8 @@ from unidiff import PatchSet, PatchedFile DATE_PREFIX = 'Date: ' FROM_PREFIX = 'From: ' +SUBJECT_PREFIX = 'Subject: ' +subject_patch_regex = re.compile(r'^\[PATCH( \d+/\d+)?\] ') unidiff_supports_renaming = hasattr(PatchedFile(), 'is_rename') @@ -37,7 +40,9 @@ class GitEmail(GitCommit): diff = PatchSet.from_filename(filename) date = None author = None + subject = '' + subject_last = False with open(self.filename, 'r') as f: lines = f.read().splitlines() lines = list(takewhile(lambda line: line != '---', lines)) @@ -46,8 +51,21 @@ class GitEmail(GitCommit): date = parse(line[len(DATE_PREFIX):]) elif line.startswith(FROM_PREFIX): author = GitCommit.format_git_author(line[len(FROM_PREFIX):]) + elif line.startswith(SUBJECT_PREFIX): + subject = line[len(SUBJECT_PREFIX):] + subject_last = True + elif subject_last and line.startswith(' '): + subject += line + elif line == '': + break + else: + subject_last = False + + if subject: + subject = subject_patch_regex.sub('', subject) header = list(takewhile(lambda line: line != '', lines)) - body = lines[len(header) + 1:] + # Note: commit message consists of email subject, empty line, email body + message = [subject] + lines[len(header):] modified_files = [] for f in diff: @@ -67,7 +85,7 @@ class GitEmail(GitCommit): else: t = 'M' modified_files.append((target if t != 'D' else source, t)) - git_info = GitInfo(None, date, author, body, modified_files) + git_info = GitInfo(None, date, author, message, modified_files) super().__init__(git_info, commit_to_info_hook=lambda x: None) diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 6d65963..319e065 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -427,3 +427,16 @@ class TestGccChangelog(unittest.TestCase): def test_multi_same_file(self): email = self.from_patch_glob('0001-OpenMP-Fix-SIMT') assert email.errors[0].message == 'same file specified multiple times' + + def test_pr_only_in_subject(self): + email = self.from_patch_glob('0001-rs6000-Support-doubleword') + assert (email.errors[0].message == + 'PR 100085 in subject but not in changelog') + + def test_wrong_pr_comp_in_subject(self): + email = self.from_patch_glob('pr-wrong-comp.patch') + assert email.errors[0].message == 'invalid PR component in subject' + + def test_copyright_years(self): + email = self.from_patch_glob('copyright-years.patch') + assert not email.errors diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt index 39d40b8..ba51627 100644 --- a/contrib/gcc-changelog/test_patches.txt +++ b/contrib/gcc-changelog/test_patches.txt @@ -1461,6 +1461,7 @@ Subject: [PATCH 0030/2034] PR c++/92746 - ICE with noexcept of function Another place that needs to specially handle Concepts TS function-style concepts. + PR c++/92746 * except.c (check_noexcept_r): Handle concept-check. --- gcc/cp/ChangeLog | 3 +++ @@ -1977,7 +1978,7 @@ index aac31d02b6c..56c470f6ecf 100644 From 5194b51ed9714808d88827531e91474895b6c706 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 16 Jan 2020 16:55:39 -0500 -Subject: [PATCH 0121/2034] PR c++/93286 - ICE with __is_constructible and +Subject: [PATCH 0121/2034] PR c++/12345 - ICE with __is_constructible and variadic template. Here we had been recursing in tsubst_copy_and_build if type2 was a TREE_LIST @@ -3406,3 +3407,60 @@ index 00000000000..21540512e23 + -- 2.25.1 +=== 0001-rs6000-Support-doubleword === +From f700e4b0ee3ef53b48975cf89be26b9177e3a3f3 Mon Sep 17 00:00:00 2001 +From: Xionghu Luo +Date: Tue, 8 Jun 2021 21:48:12 -0500 +Subject: [PATCH] rs6000: Support doubleword swaps removal in rot64 load store + [PR100085] + +gcc/testsuite/ChangeLog: + + * gcc.target/powerpc/pr100085.c: New test. +--- +diff --git a/gcc/testsuite/gcc.target/powerpc/pr100085.c b/gcc/testsuite/gcc.target/powerpc/pr100085.c +new file mode 100644 +index 00000000000..7d8b147b127 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/powerpc/pr100085.c +@@ -0,0 +1,1 @@ ++ +-- +2.25.1 +=== pr-wrong-comp.patch === +From 5194b51ed9714808d88827531e91474895b6c706 Mon Sep 17 00:00:00 2001 +From: Jason Merrill +Date: Thu, 16 Jan 2020 16:55:39 -0500 +Subject: [PATCH 0121/2034] PR some/93286 - ICE with __is_constructible and + variadic template. + +gcc/testsuite/ChangeLog: + + PR c++/93286 + * gcc.target/powerpc/pr100085.c: New test. +--- +diff --git a/gcc/testsuite/gcc.target/powerpc/pr100085.c b/gcc/testsuite/gcc.target/powerpc/pr100085.c +new file mode 100644 +index 00000000000..7d8b147b127 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/powerpc/pr100085.c +@@ -0,0 +1,1 @@ ++ +-- +2.25.1 +==== copyright-years.patch === +From 99dee82307f1e163e150c9c810452979994047ce Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Mon, 4 Jan 2021 10:26:59 +0100 +Subject: [PATCH] Update copyright years. + +--- +diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c +new file mode 100644 +index 6f67552d075..32478f070e8 100644 +--- a/lto-plugin/lto-plugin.c ++++ b/lto-plugin/lto-plugin.c +@@ -0,0 +1,1 @@ ++ +-- +2.25.1 -- cgit v1.1 From 4e70c34e5ce6fefba22015bd4fe0df33a13567d4 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Mon, 14 Jun 2021 00:16:35 +0000 Subject: Daily bump. --- contrib/ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index da7d4d5..d8df6be 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,17 @@ +2021-06-13 Tobias Burnus + + * gcc-changelog/git_commit.py (pr_regex): Add ?P for group('pr'). + (subject_pr_regex, subject_pr2_regex): New. + (GitInfo.__init__, GitCommit.parse_changelog): Check subject PRs. + * gcc-changelog/git_email.py (SUBJECT_PREFIX, subject_patch_regex): New. + (GitEmail.__init__): Parse 'Subject:' and pass it to GitInfo. + * gcc-changelog/test_email.py (test_pr_only_in_subject, + test_wrong_pr_comp_in_subject, test_copyright_years): New. + * gcc-changelog/test_patches.txt (0030-PR-c-92746, pr-check1.patch): + Update to avoid triggering the new check. + (0001-rs6000-Support-doubleword, pr-wrong-comp.patch, + copyright-years.patch): New. + 2021-06-11 Martin Liska * gcc-changelog/git_update_version.py: Ignore commit that -- cgit v1.1 From 58e3b17f4c42d050a1768b025712e6d18bcb76ae Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 16 Jun 2021 16:46:38 -0400 Subject: mklog: add subject line skeleton In the recent gcc-commit-mklog thread on gcc@ it occurred to me that the command could also fill in part of the subject line. If the first PR is foo/1234, and the commit does not yet have a subject line, this will add foo: [PR1234] contrib/ChangeLog: * mklog.py: Add an initial component: [PRnnnnn] line when we have a PR. --- contrib/mklog.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 5c93c70..1f59055 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -39,6 +39,7 @@ import requests from unidiff import PatchSet pr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PPR [a-z+-]+\/[0-9]+)') +prnum_regex = re.compile(r'PR (?P[a-z+-]+)/(?P[0-9]+)') dr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PDR [0-9]+)') dg_regex = re.compile(r'{\s+dg-(error|warning)') identifier_regex = re.compile(r'^([a-zA-Z0-9_#].*)') @@ -67,6 +68,8 @@ PATCH must be generated using diff(1)'s -up or -cp options script_folder = os.path.realpath(__file__) root = os.path.dirname(os.path.dirname(script_folder)) +firstpr = '' + def find_changelog(path): folder = os.path.split(path)[0] @@ -134,6 +137,7 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False): prs = [] out = '' diff = PatchSet(data) + global firstpr for file in diff: # skip files that can't be parsed @@ -166,6 +170,9 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False): # Found dg-warning/dg-error line break + if prs: + firstpr = prs[0] + if fill_pr_titles: out += get_pr_titles(prs) @@ -308,8 +315,14 @@ if __name__ == '__main__': start = list(takewhile(lambda l: not l.startswith('#'), lines)) end = lines[len(start):] with open(args.changelog, 'w') as f: + if not start or not start[0]: + # initial commit subject line 'component: [PRnnnnn]' + m = prnum_regex.match(firstpr) + if m: + title = f'{m.group("comp")}: [PR{m.group("num")}]' + start.insert(0, title) if start: - # appent empty line + # append empty line if start[-1] != '': start.append('') else: -- cgit v1.1 From 688359a27d835bbdab554fdf5eb207f1bd678371 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Fri, 18 Jun 2021 00:16:58 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index d8df6be..6d5a2e4 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-06-17 Jason Merrill + + * mklog.py: Add an initial component: [PRnnnnn] line when + we have a PR. + 2021-06-13 Tobias Burnus * gcc-changelog/git_commit.py (pr_regex): Add ?P for group('pr'). -- cgit v1.1 From edf0c3ffb59d75c11e05bc722432dc554e275c72 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 21 Jun 2021 15:17:22 +0200 Subject: contrib/mklog.py: Improve PR handling Co-authored-by: Martin Sebor contrib/ChangeLog: * mklog.py (bugzilla_url): Fetch also component. (pr_filename_regex): New. (get_pr_titles): Update PR string with correct format and component. (generate_changelog): Take additional PRs; extract PR from the filename. (__main__): Add -b/--pr-numbers argument. * test_mklog.py (EXPECTED4): Update to expect a PR for the new file. --- contrib/mklog.py | 38 +++++++++++++++++++++++++++++--------- contrib/test_mklog.py | 3 +++ 2 files changed, 32 insertions(+), 9 deletions(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 1f59055..0b434f6 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -42,6 +42,7 @@ pr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PPR [a-z+-]+\/[0-9]+)') prnum_regex = re.compile(r'PR (?P[a-z+-]+)/(?P[0-9]+)') dr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PDR [0-9]+)') dg_regex = re.compile(r'{\s+dg-(error|warning)') +pr_filename_regex = re.compile(r'(^|[\W_])[Pp][Rr](?P\d{4,})') identifier_regex = re.compile(r'^([a-zA-Z0-9_#].*)') comment_regex = re.compile(r'^\/\*') struct_regex = re.compile(r'^(class|struct|union|enum)\s+' @@ -52,7 +53,7 @@ fn_regex = re.compile(r'([a-zA-Z_][^()\s]*)\s*\([^*]') template_and_param_regex = re.compile(r'<[^<>]*>') md_def_regex = re.compile(r'\(define.*\s+"(.*)"') bugzilla_url = 'https://gcc.gnu.org/bugzilla/rest.cgi/bug?id=%s&' \ - 'include_fields=summary' + 'include_fields=summary,component' function_extensions = {'.c', '.cpp', '.C', '.cc', '.h', '.inc', '.def', '.md'} @@ -118,20 +119,23 @@ def sort_changelog_files(changed_file): def get_pr_titles(prs): - output = '' - for pr in prs: + output = [] + for idx, pr in enumerate(prs): pr_id = pr.split('/')[-1] r = requests.get(bugzilla_url % pr_id) bugs = r.json()['bugs'] if len(bugs) == 1: - output += '%s - %s\n' % (pr, bugs[0]['summary']) - print(output) + prs[idx] = 'PR %s/%s' % (bugs[0]['component'], pr_id) + out = '%s - %s\n' % (prs[idx], bugs[0]['summary']) + if out not in output: + output.append(out) if output: - output += '\n' - return output + output.append('') + return '\n'.join(output) -def generate_changelog(data, no_functions=False, fill_pr_titles=False): +def generate_changelog(data, no_functions=False, fill_pr_titles=False, + additional_prs=None): changelogs = {} changelog_list = [] prs = [] @@ -139,6 +143,8 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False): diff = PatchSet(data) global firstpr + if additional_prs: + prs = [pr for pr in additional_prs if pr not in prs] for file in diff: # skip files that can't be parsed if file.path == '/dev/null': @@ -154,21 +160,32 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False): # Only search first ten lines as later lines may # contains commented code which a note that it # has not been tested due to a certain PR or DR. + this_file_prs = [] for line in list(file)[0][0:10]: m = pr_regex.search(line.value) if m: pr = m.group('pr') if pr not in prs: prs.append(pr) + this_file_prs.append(pr.split('/')[-1]) else: m = dr_regex.search(line.value) if m: dr = m.group('dr') if dr not in prs: prs.append(dr) + this_file_prs.append(dr.split('/')[-1]) elif dg_regex.search(line.value): # Found dg-warning/dg-error line break + # PR number in the file name + fname = os.path.basename(file.path) + m = pr_filename_regex.search(fname) + if m: + pr = m.group('pr') + pr2 = 'PR ' + pr + if pr not in this_file_prs and pr2 not in prs: + prs.append(pr2) if prs: firstpr = prs[0] @@ -286,6 +303,9 @@ if __name__ == '__main__': parser = argparse.ArgumentParser(description=help_message) parser.add_argument('input', nargs='?', help='Patch file (or missing, read standard input)') + parser.add_argument('-b', '--pr-numbers', action='store', + type=lambda arg: arg.split(','), nargs="?", + help='Add the specified PRs (comma separated)') parser.add_argument('-s', '--no-functions', action='store_true', help='Do not generate function names in ChangeLogs') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', @@ -309,7 +329,7 @@ if __name__ == '__main__': update_copyright(data) else: output = generate_changelog(data, args.no_functions, - args.fill_up_bug_titles) + args.fill_up_bug_titles, args.pr_numbers) if args.changelog: lines = open(args.changelog).read().split('\n') start = list(takewhile(lambda l: not l.startswith('#'), lines)) diff --git a/contrib/test_mklog.py b/contrib/test_mklog.py index a0670da..f5e9ecd 100755 --- a/contrib/test_mklog.py +++ b/contrib/test_mklog.py @@ -240,6 +240,9 @@ index 4ad78c1f77b..6687b368038 100644 ''' EXPECTED4 = '''\ + + PR 50209 + gcc/ChangeLog: * ipa-icf.c: -- cgit v1.1 From 2f080224cfa9de0e215324c6ac242d6ee3f27172 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 22 Jun 2021 00:16:29 +0000 Subject: Daily bump. --- contrib/ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 6d5a2e4..9b31022 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,14 @@ +2021-06-21 Tobias Burnus + Martin Sebor + + * mklog.py (bugzilla_url): Fetch also component. + (pr_filename_regex): New. + (get_pr_titles): Update PR string with correct format and component. + (generate_changelog): Take additional PRs; extract PR from the + filename. + (__main__): Add -b/--pr-numbers argument. + * test_mklog.py (EXPECTED4): Update to expect a PR for the new file. + 2021-06-17 Jason Merrill * mklog.py: Add an initial component: [PRnnnnn] line when -- cgit v1.1 From 48b312b4ba4bb738e22b92980760b38ffa6d68a5 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 22 Jun 2021 09:50:38 +0200 Subject: contrib: fix a flake8 issue contrib/ChangeLog: * mklog.py: Fix flake8 issue. --- contrib/mklog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 0b434f6..674c1dc 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -304,7 +304,7 @@ if __name__ == '__main__': parser.add_argument('input', nargs='?', help='Patch file (or missing, read standard input)') parser.add_argument('-b', '--pr-numbers', action='store', - type=lambda arg: arg.split(','), nargs="?", + type=lambda arg: arg.split(','), nargs='?', help='Add the specified PRs (comma separated)') parser.add_argument('-s', '--no-functions', action='store_true', help='Do not generate function names in ChangeLogs') -- cgit v1.1 From 419af06a35933fb1bb7c87fe9c7306755afce9a0 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 23 Jun 2021 00:16:28 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 9b31022..b46a215 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-06-22 Martin Liska + + * mklog.py: Fix flake8 issue. + 2021-06-21 Tobias Burnus Martin Sebor -- cgit v1.1 From c2124b51a9b83c76400ebb1862b26f61410e77db Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 22 Jun 2021 09:19:45 +0200 Subject: contrib: add git-commit-mklog wrapper contrib/ChangeLog: * gcc-git-customization.sh: Use the new wrapper. * git-commit-mklog.py: New file. * prepare-commit-msg: Support GCC_MKLOG_ARGS. --- contrib/gcc-git-customization.sh | 2 +- contrib/git-commit-mklog.py | 53 ++++++++++++++++++++++++++++++++++++++++ contrib/prepare-commit-msg | 2 +- 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100755 contrib/git-commit-mklog.py (limited to 'contrib') diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh index e7e6662..6f8f23d 100755 --- a/contrib/gcc-git-customization.sh +++ b/contrib/gcc-git-customization.sh @@ -28,7 +28,7 @@ git config alias.gcc-undescr \!"f() { o=\$(git config --get gcc-config.upstream) git config alias.gcc-verify '!f() { "`git rev-parse --show-toplevel`/contrib/gcc-changelog/git_check_commit.py" $@; } ; f' git config alias.gcc-backport '!f() { "`git rev-parse --show-toplevel`/contrib/git-backport.py" $@; } ; f' git config alias.gcc-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/mklog.py" $@; } ; f' -git config alias.gcc-commit-mklog '!f() { GCC_FORCE_MKLOG=1 git commit "$@"; }; f' +git config alias.gcc-commit-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/git-commit-mklog.py" $@; }; f' # Make diff on MD files use "(define" as a function marker. # Use this in conjunction with a .gitattributes file containing diff --git a/contrib/git-commit-mklog.py b/contrib/git-commit-mklog.py new file mode 100755 index 0000000..9c59fb9 --- /dev/null +++ b/contrib/git-commit-mklog.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 + +# Copyright (C) 2020 Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# The script is wrapper for git commit-mklog alias where it parses +# -b/--pr-numbers argument and passes it via environment variable +# to mklog.py script. + +import argparse +import os +import subprocess + +if __name__ == '__main__': + children_args = [] + myenv = os.environ.copy() + + parser = argparse.ArgumentParser(description='git-commit-mklog wrapped') + parser.add_argument('-b', '--pr-numbers', action='store', + type=lambda arg: arg.split(','), nargs='?', + help='Add the specified PRs (comma separated)') + parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', + help='Download title of mentioned PRs') + args, unknown_args = parser.parse_known_args() + + myenv['GCC_FORCE_MKLOG'] = '1' + mklog_args = [] + if args.pr_numbers: + mklog_args.append(f'-b {",".join(args.pr_numbers)}') + if args.fill_up_bug_titles: + mklog_args.append('-p') + + if mklog_args: + myenv['GCC_MKLOG_ARGS'] = ' '.join(mklog_args) + + commit_args = ' '.join(unknown_args) + subprocess.run(f'git commit {commit_args}', shell=True, env=myenv) diff --git a/contrib/prepare-commit-msg b/contrib/prepare-commit-msg index 969847d..5da8784 100755 --- a/contrib/prepare-commit-msg +++ b/contrib/prepare-commit-msg @@ -78,4 +78,4 @@ else tee="cat" fi -git $cmd | $tee | git gcc-mklog -c "$COMMIT_MSG_FILE" +git $cmd | $tee | git gcc-mklog $GCC_MKLOG_ARGS -c "$COMMIT_MSG_FILE" -- cgit v1.1 From fcf617f0d2a5a1b624718e07d7b219cb0234436f Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Thu, 24 Jun 2021 00:16:30 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index b46a215..9cfa3f0 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-06-23 Martin Liska + + * gcc-git-customization.sh: Use the new wrapper. + * git-commit-mklog.py: New file. + * prepare-commit-msg: Support GCC_MKLOG_ARGS. + 2021-06-22 Martin Liska * mklog.py: Fix flake8 issue. -- cgit v1.1 From b838641bb0d4de5b25128b54012155ab46f452d0 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 28 Jun 2021 13:08:10 +0200 Subject: mklog: Handle correctly long lines. contrib/ChangeLog: * mklog.py: Handle correctly long lines. * test_mklog.py: Test it. --- contrib/mklog.py | 22 ++++++++++++++++++---- contrib/test_mklog.py | 25 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index 674c1dc..ba70af0 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -38,6 +38,9 @@ import requests from unidiff import PatchSet +LINE_LIMIT = 100 +TAB_WIDTH = 8 + pr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PPR [a-z+-]+\/[0-9]+)') prnum_regex = re.compile(r'PR (?P[a-z+-]+)/(?P[0-9]+)') dr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PDR [0-9]+)') @@ -134,6 +137,16 @@ def get_pr_titles(prs): return '\n'.join(output) +def append_changelog_line(out, relative_path, text): + line = f'\t* {relative_path}:' + if len(line.replace('\t', ' ' * TAB_WIDTH) + ' ' + text) <= LINE_LIMIT: + out += f'{line} {text}\n' + else: + out += f'{line}\n' + out += f'\t{text}\n' + return out + + def generate_changelog(data, no_functions=False, fill_pr_titles=False, additional_prs=None): changelogs = {} @@ -213,12 +226,12 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, relative_path = file.path[len(changelog):].lstrip('/') functions = [] if file.is_added_file: - msg = 'New test' if in_tests else 'New file' - out += '\t* %s: %s.\n' % (relative_path, msg) + msg = 'New test.' if in_tests else 'New file.' + out = append_changelog_line(out, relative_path, msg) elif file.is_removed_file: - out += '\t* %s: Removed.\n' % (relative_path) + out = append_changelog_line(out, relative_path, 'Removed.') elif hasattr(file, 'is_rename') and file.is_rename: - out += '\t* %s: Moved to...\n' % (relative_path) + out = append_changelog_line(out, relative_path, 'Moved to...') new_path = file.target_file[2:] # A file can be theoretically moved to a location that # belongs to a different ChangeLog. Let user fix it. @@ -227,6 +240,7 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, out += '\t* %s: ...here.\n' % (new_path) elif os.path.basename(file.path) in generated_files: out += '\t* %s: Regenerate.\n' % (relative_path) + append_changelog_line(out, relative_path, 'Regenerate.') else: if not no_functions: for hunk in file: diff --git a/contrib/test_mklog.py b/contrib/test_mklog.py index f5e9ecd..bf2f280 100755 --- a/contrib/test_mklog.py +++ b/contrib/test_mklog.py @@ -443,6 +443,27 @@ gcc/ChangeLog: ''' +PATCH10 = '''\ +diff --git a/libgomp/doc/the-libgomp-abi/implementing-firstprivate-lastprivate-copyin-and-copyprivate-clauses.rst b/libgomp/doc/the-libgomp-abi/implementing-firstprivate-lastprivate-copyin-and-copyprivate-clauses.rst +new file mode 100644 +index 00000000000..ad3c6d856fc +--- /dev/null ++++ b/libgomp/doc/the-libgomp-abi/implementing-firstprivate-lastprivate-copyin-and-copyprivate-clauses.rst +@@ -0,0 +1,3 @@ ++ ++ ++ + +''' + +EXPECTED10 = '''\ +libgomp/ChangeLog: + + * doc/the-libgomp-abi/implementing-firstprivate-lastprivate-copyin-and-copyprivate-clauses.rst: + New file. + +''' + class TestMklog(unittest.TestCase): def test_macro_definition(self): changelog = generate_changelog(PATCH1) @@ -485,3 +506,7 @@ class TestMklog(unittest.TestCase): def test_define_macro_parsing(self): changelog = generate_changelog(PATCH9) assert changelog == EXPECTED9 + + def test_long_filenames(self): + changelog = generate_changelog(PATCH10) + assert changelog == EXPECTED10 -- cgit v1.1 From c8abc2058e96dd12454078d66be9982dfebfd154 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 29 Jun 2021 00:16:42 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 9cfa3f0..79a767c 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-06-28 Martin Liska + + * mklog.py: Handle correctly long lines. + * test_mklog.py: Test it. + 2021-06-23 Martin Liska * gcc-git-customization.sh: Use the new wrapper. -- cgit v1.1 From 01d402c5e0ac1ddf5618bbe316b50067625fda46 Mon Sep 17 00:00:00 2001 From: Eugene Rozenfeld Date: Thu, 1 Jul 2021 16:21:36 -0700 Subject: Update gen_autofdo_event.py and gcc-auto-profile. gen_autofdo_event.py was stumbling on models with stepping so I updated the script to handle this case similar to the code in https://github.com/andikleen/pmu-tools/blob/c6a5f63aede19def8886d6a8b74d7a55c38ca947/event_download.py The second change was to tolerate cases when the CPU supports PEBS but the perf command with /p fails. This can happen in, e.g., a virtual machine. I regenerated gcc-auto-profile using the updated script. contrib/ChangeLog: * gen_autofdo_event.py: handle stepping, non-working PEBS gcc/ChangeLog: * config/i386/gcc-auto-profile: regenerate --- contrib/gen_autofdo_event.py | 54 ++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 17 deletions(-) (limited to 'contrib') diff --git a/contrib/gen_autofdo_event.py b/contrib/gen_autofdo_event.py index c97460c..1eb6f1d 100755 --- a/contrib/gen_autofdo_event.py +++ b/contrib/gen_autofdo_event.py @@ -46,20 +46,29 @@ args = ap.parse_args() eventmap = collections.defaultdict(list) -def get_cpu_str(): - with open('/proc/cpuinfo', 'r') as c: - vendor, fam, model = None, None, None - for j in c: - n = j.split() - if n[0] == 'vendor_id': - vendor = n[2] - elif n[0] == 'model' and n[1] == ':': - model = int(n[2]) - elif n[0] == 'cpu' and n[1] == 'family': - fam = int(n[3]) - if vendor and fam and model: - return "%s-%d-%X" % (vendor, fam, model), model - return None, None +def get_cpustr(): + cpuinfo = os.getenv("CPUINFO") + if cpuinfo is None: + cpuinfo = '/proc/cpuinfo' + f = open(cpuinfo, 'r') + cpu = [None, None, None, None] + for j in f: + n = j.split() + if n[0] == 'vendor_id': + cpu[0] = n[2] + elif n[0] == 'model' and n[1] == ':': + cpu[2] = int(n[2]) + elif n[0] == 'cpu' and n[1] == 'family': + cpu[1] = int(n[3]) + elif n[0] == 'stepping' and n[1] == ':': + cpu[3] = int(n[2]) + if all(v is not None for v in cpu): + break + # stepping for SKX only + stepping = cpu[0] == "GenuineIntel" and cpu[1] == 6 and cpu[2] == 0x55 + if stepping: + return "%s-%d-%X-%X" % tuple(cpu) + return "%s-%d-%X" % tuple(cpu)[:3] def find_event(eventurl, model): print >>sys.stderr, "Downloading", eventurl @@ -81,7 +90,7 @@ def find_event(eventurl, model): return found if not args.all: - cpu, model = get_cpu_str() + cpu = get_cpu_str() if not cpu: sys.exit("Unknown CPU type") @@ -94,7 +103,8 @@ for j in u: n = j.rstrip().split(',') if len(n) >= 4 and (args.all or n[0] == cpu) and n[3] == "core": if args.all: - vendor, fam, model = n[0].split("-") + components = n[0].split("-") + model = components[2] model = int(model, 16) cpufound += 1 found += find_event(baseurl + n[2], model) @@ -146,7 +156,17 @@ case `egrep -q "^cpu family\s*: 6" /proc/cpuinfo && echo >&2 "Unknown CPU. Run contrib/gen_autofdo_event.py --all --script to update script." exit 1 ;;''' print "esac" - print 'exec perf record -e $E -b "$@"' + print "set -x" + print 'if ! perf record -e $E -b "$@" ; then' + print ' # PEBS may not actually be working even if the processor supports it' + print ' # (e.g., in a virtual machine). Trying to run without /p.' + print ' set +x' + print ' echo >&2 "Retrying without /p."' + print ' E="$(echo "${E}" | sed -e \'s/\/p/\//\')"' + print ' set -x' + print ' exec perf record -e $E -b "$@"' + print ' set +x' + print 'fi' if cpufound == 0 and not args.all: sys.exit('CPU %s not found' % cpu) -- cgit v1.1 From 7a60a6e8b36dec960939494baef0f1f15dbfc450 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Sat, 3 Jul 2021 00:16:31 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 79a767c..e38ab1e 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-07-02 Eugene Rozenfeld + + * gen_autofdo_event.py: handle stepping, non-working PEBS + 2021-06-28 Martin Liska * mklog.py: Handle correctly long lines. -- cgit v1.1 From b51de13d81920f92ebe067b9c76e9d2195685099 Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Tue, 20 Jul 2021 11:06:01 +0100 Subject: Limit fill-column to 79 The current line-length limit is set to 80, but that allows a character to appear in the 80th column, and that causes emacs to display a line-wrap followed by a blank line when the display/window width is 80 columns. Furthermore, this seems to contradict the coding-style rules on the wiki which suggest that the line limit should be 79. So reduce the line width in both the emacs control file and the contrib vimrc file to 79 characters. ChangeLog: * .dir-locals.el (c-mode): Change fill-column to 79. contrib/ChangeLog: * vimrc (textwidth): Change non-gitcommit length to 79. --- contrib/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/vimrc b/contrib/vimrc index 356d455..b7a8ab7 100644 --- a/contrib/vimrc +++ b/contrib/vimrc @@ -42,7 +42,7 @@ function! SetStyle() if &filetype == "gitcommit" setlocal textwidth=72 else - setlocal textwidth=80 + setlocal textwidth=79 endif setlocal formatoptions-=ro formatoptions+=cqlt if index(l:c_exts, l:ext) != -1 || &filetype == "c" || &filetype == "cpp" -- cgit v1.1 From 92d4550991de7e0970a38939422b31e9dc07dd11 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 21 Jul 2021 00:16:54 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e38ab1e..4999204 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-07-20 Richard Earnshaw + + * vimrc (textwidth): Change non-gitcommit length to 79. + 2021-07-02 Eugene Rozenfeld * gen_autofdo_event.py: handle stepping, non-working PEBS -- cgit v1.1 From e4604715716879c2bc53f7838c25f9730144e63f Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 3 Aug 2021 09:22:30 +0200 Subject: gcc-changelog: ignore one more commit contrib/ChangeLog: * gcc-changelog/git_update_version.py: Ignore problematic commit. --- contrib/gcc-changelog/git_update_version.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index b97ca58..1837c1a 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -29,7 +29,8 @@ current_timestamp = datetime.datetime.now().strftime('%Y%m%d\n') # Skip the following commits, they cannot be correctly processed IGNORED_COMMITS = ( 'c2be82058fb40f3ae891c68d185ff53e07f14f45', - '04a040d907a83af54e0a98bdba5bfabc0ef4f700') + '04a040d907a83af54e0a98bdba5bfabc0ef4f700', + '2e96b5f14e4025691b57d2301d71aa6092ed44bc') def read_timestamp(path): -- cgit v1.1 From 4d17ca1bc74109e5cc4ef34890b6293c4bcb1d6a Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 3 Aug 2021 07:49:16 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 4999204..693c6ac 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-08-03 Martin Liska + + * gcc-changelog/git_update_version.py: Ignore problematic + commit. + 2021-07-20 Richard Earnshaw * vimrc (textwidth): Change non-gitcommit length to 79. -- cgit v1.1 From 84f906df4f0e99b94565f1ca72cf57f63420ad8a Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 12 Jul 2021 12:07:19 +0200 Subject: mklog: support '-b c/101343' format. contrib/ChangeLog: * mklog.py: Support additional PRs without PR prefix. --- contrib/mklog.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index ba70af0..d2aea85 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -157,7 +157,11 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, global firstpr if additional_prs: - prs = [pr for pr in additional_prs if pr not in prs] + for apr in additional_prs: + if not apr.startswith('PR ') and '/' in apr: + apr = 'PR ' + apr + if apr not in prs: + prs.append(apr) for file in diff: # skip files that can't be parsed if file.path == '/dev/null': -- cgit v1.1 From 3ae564ea7410e99e533bc87f999a04b2647c831d Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 11 Aug 2021 00:16:27 +0000 Subject: Daily bump. --- contrib/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 693c6ac..4bcb310 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2021-08-10 Martin Liska + + * mklog.py: Support additional PRs without PR prefix. + 2021-08-03 Martin Liska * gcc-changelog/git_update_version.py: Ignore problematic -- cgit v1.1 From 0684c8d3effab2c9c1b29938f5e56c77106af564 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 17 Aug 2021 14:57:40 +0200 Subject: commit-mklog: Add --co argument. The argument can be used for addition of Co-Authored-By lines with --trailer='Co-Authored-By=Mona Lisa Octocat '. contrib/ChangeLog: * gcc-git-customization.sh: Wrap $@ in quotes. * git-commit-mklog.py: Add new argument --co. * mklog.py: Skip the Co-Authored-By lines. --- contrib/gcc-git-customization.sh | 2 +- contrib/git-commit-mklog.py | 6 ++++++ contrib/mklog.py | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh index 6f8f23d..aca61b7 100755 --- a/contrib/gcc-git-customization.sh +++ b/contrib/gcc-git-customization.sh @@ -28,7 +28,7 @@ git config alias.gcc-undescr \!"f() { o=\$(git config --get gcc-config.upstream) git config alias.gcc-verify '!f() { "`git rev-parse --show-toplevel`/contrib/gcc-changelog/git_check_commit.py" $@; } ; f' git config alias.gcc-backport '!f() { "`git rev-parse --show-toplevel`/contrib/git-backport.py" $@; } ; f' git config alias.gcc-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/mklog.py" $@; } ; f' -git config alias.gcc-commit-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/git-commit-mklog.py" $@; }; f' +git config alias.gcc-commit-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/git-commit-mklog.py" "$@"; }; f' # Make diff on MD files use "(define" as a function marker. # Use this in conjunction with a .gitattributes file containing diff --git a/contrib/git-commit-mklog.py b/contrib/git-commit-mklog.py index 9c59fb9..eda3fc4 100755 --- a/contrib/git-commit-mklog.py +++ b/contrib/git-commit-mklog.py @@ -37,6 +37,8 @@ if __name__ == '__main__': help='Add the specified PRs (comma separated)') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', help='Download title of mentioned PRs') + parser.add_argument('--co', + help='Add Co-Authored-By trailer (comma separated)') args, unknown_args = parser.parse_known_args() myenv['GCC_FORCE_MKLOG'] = '1' @@ -49,5 +51,9 @@ if __name__ == '__main__': if mklog_args: myenv['GCC_MKLOG_ARGS'] = ' '.join(mklog_args) + if args.co: + for author in args.co.split(','): + unknown_args.append(f'--trailer "Co-Authored-By: {author}"') + commit_args = ' '.join(unknown_args) subprocess.run(f'git commit {commit_args}', shell=True, env=myenv) diff --git a/contrib/mklog.py b/contrib/mklog.py index d2aea85..d362be5 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -40,6 +40,7 @@ from unidiff import PatchSet LINE_LIMIT = 100 TAB_WIDTH = 8 +CO_AUTHORED_BY_PREFIX = 'co-authored-by: ' pr_regex = re.compile(r'(\/(\/|\*)|[Cc*!])\s+(?PPR [a-z+-]+\/[0-9]+)') prnum_regex = re.compile(r'PR (?P[a-z+-]+)/(?P[0-9]+)') @@ -317,6 +318,12 @@ def update_copyright(data): f.write(content) +def skip_line_in_changelog(line): + if line.lower().startswith(CO_AUTHORED_BY_PREFIX) or line.startswith('#'): + return False + return True + + if __name__ == '__main__': parser = argparse.ArgumentParser(description=help_message) parser.add_argument('input', nargs='?', @@ -350,7 +357,7 @@ if __name__ == '__main__': args.fill_up_bug_titles, args.pr_numbers) if args.changelog: lines = open(args.changelog).read().split('\n') - start = list(takewhile(lambda l: not l.startswith('#'), lines)) + start = list(takewhile(skip_line_in_changelog, lines)) end = lines[len(start):] with open(args.changelog, 'w') as f: if not start or not start[0]: -- cgit v1.1 From 6e529985d8956f74492e3176026fc02dc8f01b6c Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Thu, 19 Aug 2021 00:16:42 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 4bcb310..d4aa96f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-08-18 Martin Liska + + * gcc-git-customization.sh: Wrap $@ in quotes. + * git-commit-mklog.py: Add new argument --co. + * mklog.py: Skip the Co-Authored-By lines. + 2021-08-10 Martin Liska * mklog.py: Support additional PRs without PR prefix. -- cgit v1.1 From 0deabebedd16c9519bfb1dfbff303c2d9bd701ee Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 24 Aug 2021 05:56:59 +0000 Subject: Fix a few problems with download_prerequisites. There are a few problems with download_prerequisites are described in PR 82704. The first is on busy-box version of shasum and md5sum the extended option --check don't exist so just use -c. The second issue is the code for which shasum program to use is included twice and is different. So move which program to use for the checksum after argument parsing. The last issue is --md5 option has been broken for sometime now as the program is named md5sum and not just md5. Nobody updated switch table to be correct. contrib/ChangeLog: PR other/82704 * download_prerequisites: Fix issues with --md5 and --sha512 options. --- contrib/download_prerequisites | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'contrib') diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites index 51e715f..8f69b61 100755 --- a/contrib/download_prerequisites +++ b/contrib/download_prerequisites @@ -46,18 +46,6 @@ verify=1 force=0 OS=$(uname) -case $OS in - "Darwin"|"FreeBSD"|"DragonFly"|"AIX") - chksum='shasum -a 512 --check' - ;; - "OpenBSD") - chksum='sha512 -c' - ;; - *) - chksum='sha512sum -c' - ;; -esac - if type wget > /dev/null ; then fetch='wget' else @@ -113,7 +101,7 @@ do done unset arg -# Emulate Linux's 'md5 --check' on macOS +# Emulate Linux's 'md5sum --check' on macOS md5_check() { # Store the standard input: a line from contrib/prerequisites.md5: md5_checksum_line=$(cat -) @@ -162,26 +150,10 @@ do verify=0 ;; --sha512) - case $OS in - "Darwin") - chksum='shasum -a 512 --check' - ;; - *) - chksum='sha512sum --check' - ;; - esac chksum_extension='sha512' verify=1 ;; --md5) - case $OS in - "Darwin") - chksum='md5_check' - ;; - *) - chksum='md5 --check' - ;; - esac chksum_extension='md5' verify=1 ;; @@ -212,6 +184,35 @@ done [ "x${argnext}" = x ] || die "Missing argument for option --${argnext}" unset arg argnext +case $chksum_extension in + sha512) + case $OS in + "Darwin"|"FreeBSD"|"DragonFly"|"AIX") + chksum='shasum -a 512 --check' + ;; + "OpenBSD") + chksum='sha512 -c' + ;; + *) + chksum='sha512sum -c' + ;; + esac + ;; + md5) + case $OS in + "Darwin") + chksum='md5_check' + ;; + *) + chksum='md5sum -c' + ;; + esac + ;; + *) + die "Unkown checksum $chksum_extension" + ;; +esac + [ -e ./gcc/BASE-VER ] \ || die "You must run this script in the top-level GCC source directory" -- cgit v1.1 From 05ace2946b4369b49026789d5a83635076b10422 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Wed, 25 Aug 2021 00:16:57 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index d4aa96f..d496dc6 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-08-24 Andrew Pinski + + PR other/82704 + * download_prerequisites: Fix issues with --md5 and + --sha512 options. + 2021-08-18 Martin Liska * gcc-git-customization.sh: Wrap $@ in quotes. -- cgit v1.1 From e370a2482d41fd382055695b9a0a638ce75e1038 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 26 Aug 2021 10:20:20 +0200 Subject: mklog: fix renaming with version 0.7.0. contrib/ChangeLog: * mklog.py: Use file.{source,target}_file for proper rename handling. --- contrib/mklog.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/mklog.py b/contrib/mklog.py index d362be5..cd5ef0b 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -148,6 +148,13 @@ def append_changelog_line(out, relative_path, text): return out +def get_rel_path_if_prefixed(path, folder): + if path.startswith(folder): + return path[len(folder):].lstrip('/') + else: + return path + + def generate_changelog(data, no_functions=False, fill_pr_titles=False, additional_prs=None): changelogs = {} @@ -228,7 +235,7 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, for file in sorted(files, key=sort_changelog_files): assert file.path.startswith(changelog) in_tests = 'testsuite' in changelog or 'testsuite' in file.path - relative_path = file.path[len(changelog):].lstrip('/') + relative_path = get_rel_path_if_prefixed(file.path, changelog) functions = [] if file.is_added_file: msg = 'New test.' if in_tests else 'New file.' @@ -236,13 +243,17 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, elif file.is_removed_file: out = append_changelog_line(out, relative_path, 'Removed.') elif hasattr(file, 'is_rename') and file.is_rename: - out = append_changelog_line(out, relative_path, 'Moved to...') - new_path = file.target_file[2:] # A file can be theoretically moved to a location that # belongs to a different ChangeLog. Let user fix it. - if new_path.startswith(changelog): - new_path = new_path[len(changelog):].lstrip('/') - out += '\t* %s: ...here.\n' % (new_path) + # + # Since unidiff 0.7.0, path.file == path.target_file[2:], + # 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...') + new_path = get_rel_path_if_prefixed(file.target_file[2:], + changelog) + out += f'\t* {new_path}: ...here.\n' elif os.path.basename(file.path) in generated_files: out += '\t* %s: Regenerate.\n' % (relative_path) append_changelog_line(out, relative_path, 'Regenerate.') -- cgit v1.1 From ccc191454304cc64798585fc0c903f54f355d50b Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Fri, 27 Aug 2021 00:16:22 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index d496dc6..eeedef32 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-08-26 Martin Liska + + * mklog.py: Use file.{source,target}_file for proper rename + handling. + 2021-08-24 Andrew Pinski PR other/82704 -- cgit v1.1 From 79a017c412b412f26ec39e0ada75e247fcff5611 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 30 Aug 2021 20:30:41 +0000 Subject: Fix PR 90142: contrib/download_prerequisites uses test == Since == is not portable, it is better to use = in contrib/ download_prerequisites. The only place == was used is inside the function md5_check which is used only on Mac OS X. Tested on Mac OS X as: ./contrib/download_prerequisites --md5 Both with all files having the correct checksum and one with a broken one. contrib/ChangeLog: * download_prerequisites (md5_check): Replace == inside test with = to be more portable. --- contrib/download_prerequisites | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites index 8f69b61..11c283e 100755 --- a/contrib/download_prerequisites +++ b/contrib/download_prerequisites @@ -113,7 +113,7 @@ md5_check() { md5_checksum_output=$(md5 -r "${file_to_check}") # Grab the text before the first space md5_checksum_detected="${md5_checksum_output%% *}" - [ "${md5_checksum_expected}" == "${md5_checksum_detected}" ] \ + [ "${md5_checksum_expected}" = "${md5_checksum_detected}" ] \ || die "Cannot verify integrity of possibly corrupted file ${file_to_check}" echo "${file_to_check}: OK" } -- cgit v1.1 From 1e2f030b80cb650708b02086dbd5431cd231495f Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 31 Aug 2021 00:16:50 +0000 Subject: Daily bump. --- contrib/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index eeedef32..0b8c5e8 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2021-08-30 Andrew Pinski + + * download_prerequisites (md5_check): Replace == inside + test with = to be more portable. + 2021-08-26 Martin Liska * mklog.py: Use file.{source,target}_file for proper rename -- cgit v1.1 From 78b34cd8a803aa89e64949e99ce2e6b4f64d6b54 Mon Sep 17 00:00:00 2001 From: Serge Belyshev Date: Thu, 15 Jul 2021 20:19:18 +0300 Subject: gcc_update: use human readable name for revision string in gcc/REVISION contrib/Changelog: * gcc_update: Derive human readable name for HEAD using git describe like "git gcc-descr" with short commit hash. Drop "revision" from gcc/REVISION. --- contrib/gcc_update | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/gcc_update b/contrib/gcc_update index 80fac9f..ce47254 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -332,7 +332,22 @@ case $vcs_type in exit 1 fi - revision=`$GCC_GIT log -n1 --pretty=tformat:%p:%t:%H` + # Open-coded version of "git gcc-descr" from contrib/gcc-git-customization.sh + revision=`$GCC_GIT log -n1 --pretty=tformat:%h` + r=`$GCC_GIT describe --all --match 'basepoints/gcc-[0-9]*' HEAD \ + | sed -n 's,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)-\([0-9]\+\)-g[0-9a-f]*$,r\2-\3,p;s,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)$,r\2-0,p'`; + if test -n $r; then + o=`$GCC_GIT config --get gcc-config.upstream`; + rr=`echo $r | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p'`; + if $GCC_GIT rev-parse --verify --quiet ${o:-origin}/releases/gcc-$rr >/dev/null; then + m=releases/gcc-$rr; + else + m=master; + fi; + if $GCC_GIT merge-base --is-ancestor HEAD ${o:-origin}/$m; then + revision=${r}-g${revision}; + fi + fi branch=`$GCC_GIT name-rev --name-only HEAD || :` ;; @@ -414,6 +429,6 @@ rm -f LAST_UPDATED gcc/REVISION date echo "`TZ=UTC date` (revision $revision)" } > LAST_UPDATED -echo "[$branch revision $revision]" > gcc/REVISION +echo "[$branch $revision]" > gcc/REVISION touch_files_reexec -- cgit v1.1 From 9f99555f29cb1bce06ad7e27f254945deffafe33 Mon Sep 17 00:00:00 2001 From: GCC Administrator Date: Tue, 7 Sep 2021 00:16:34 +0000 Subject: Daily bump. --- contrib/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 0b8c5e8..73ee9d5 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2021-09-06 Serge Belyshev + + * gcc_update: Derive human readable name for HEAD using git describe + like "git gcc-descr" with short commit hash. Drop "revision" from + gcc/REVISION. + 2021-08-30 Andrew Pinski * download_prerequisites (md5_check): Replace == inside -- cgit v1.1 From c012297c9d5dfb177adf1423bdd05e5f4b87e5ec Mon Sep 17 00:00:00 2001 From: Jan-Benedict Glaw Date: Mon, 13 Sep 2021 12:13:17 +0200 Subject: cr16-elf is now obsoleted As we are still building it for ./contrib/config-list.mk, let's add --enable-obsolete so this has a chance to work. contrib/ChangeLog: * config-list.mk (LIST): --enable-obsolete for cr16-elf. --- contrib/config-list.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/config-list.mk b/contrib/config-list.mk index b9e9dd0..b493e69 100644 --- a/contrib/config-list.mk +++ b/contrib/config-list.mk @@ -40,7 +40,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \ arm-symbianelf avr-elf \ bfin-elf bfin-uclinux bfin-linux-uclibc bfin-rtems bfin-openbsd \ bpf-unknown-none \ - c6x-elf c6x-uclinux cr16-elf cris-elf \ + c6x-elf c6x-uclinux cr16-elfOPT-enable-obsolete cris-elf \ csky-elf csky-linux-gnu \ epiphany-elf epiphany-elfOPT-with-stack-offset=16 fido-elf \ fr30-elf frv-elf frv-linux ft32-elf h8300-elf hppa-linux-gnu \ -- cgit v1.1 From 20f3c168205cc7b0a97ecd54ffc54bed7637be74 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 13 Sep 2021 06:56:57 +0000 Subject: Remove m32r{,le}-*-linux* support from GCC m32r support never made it to glibc and the support for the Linux kernel was removed with 4.18. It does not remove much but no reason to keep around a port which never worked or one which the support in other projects is gone. OK? Checked to make sure m32r-linux and m32rle-linux were rejected when building. contrib/ChangeLog: * config-list.mk: Remove m32r-linux and m32rle-linux from the list. gcc/ChangeLog: * config.gcc: Add m32r-*-linux* and m32rle-*-linux* to the Unsupported targets list. Remove support for m32r-*-linux* and m32rle-*-linux*. * config/m32r/linux.h: Removed. * config/m32r/t-linux: Removed. libgcc/ChangeLog: * config.host: Remove m32r-*-linux* and m32rle-*-linux*. * config/m32r/libgcc-glibc.ver: Removed. * config/m32r/t-linux: Removed. --- contrib/config-list.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/config-list.mk b/contrib/config-list.mk index b493e69..031e4db 100644 --- a/contrib/config-list.mk +++ b/contrib/config-list.mk @@ -57,7 +57,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \ i686-cygwinOPT-enable-threads=yes i686-mingw32crt ia64-elf \ ia64-freebsd6 ia64-linux ia64-hpux ia64-hp-vms iq2000-elf lm32-elf \ lm32-rtems lm32-uclinux m32c-rtems m32c-elf m32r-elf m32rle-elf \ - m32r-linux m32rle-linux m68k-elf m68k-netbsdelf \ + m68k-elf m68k-netbsdelf \ m68k-openbsd m68k-uclinux m68k-linux m68k-rtems \ mcore-elf microblaze-linux microblaze-elf \ mips-netbsd \ -- cgit v1.1