aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2021-02-12 11:38:19 -0800
committerIan Lance Taylor <iant@golang.org>2021-02-12 11:38:19 -0800
commit89d7be42db00cd0953e7d4584877cf50a56ed046 (patch)
tree3a471e8ee60b7be687ab7501f70379618adcf174 /contrib
parent305e9d2c7815e90a29bbde1e3a7cd776861f4d7c (diff)
parent9769564e7456453e2273071d0faa5aab2554ff78 (diff)
downloadgcc-89d7be42db00cd0953e7d4584877cf50a56ed046.zip
gcc-89d7be42db00cd0953e7d4584877cf50a56ed046.tar.gz
gcc-89d7be42db00cd0953e7d4584877cf50a56ed046.tar.bz2
Merge from trunk revision 9769564e7456453e2273071d0faa5aab2554ff78.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog10
-rwxr-xr-xcontrib/mklog.py5
2 files changed, 15 insertions, 0 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 1efbbee..0bc2fee 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,13 @@
+2021-02-08 Mike Frysinger <vapier@gentoo.org>
+
+ * mklog.py (generated_files): New set.
+ (generate_changelog): Add entries based on generated_files.
+
+2021-02-03 Aaron Sawdey <acsawdey@linux.ibm.com>
+
+ * gcc_update (files_and_dependencies): Add dependency for
+ gcc/config/rs6000/fusion.md on gcc/config/rs6000/genfusion.md.
+
2021-01-28 Eric Botcazou <ebotcazou@adacore.com>
PR lto/85574
diff --git a/contrib/mklog.py b/contrib/mklog.py
index a70536a..6509886 100755
--- a/contrib/mklog.py
+++ b/contrib/mklog.py
@@ -55,6 +55,9 @@ bugzilla_url = 'https://gcc.gnu.org/bugzilla/rest.cgi/bug?id=%s&' \
function_extensions = {'.c', '.cpp', '.C', '.cc', '.h', '.inc', '.def', '.md'}
+# NB: Makefile.in isn't listed as it's not always generated.
+generated_files = {'aclocal.m4', 'config.h.in', 'configure'}
+
help_message = """\
Generate ChangeLog template for PATCH.
PATCH must be generated using diff(1)'s -up or -cp options
@@ -192,6 +195,8 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False):
if new_path.startswith(changelog):
new_path = new_path[len(changelog):].lstrip('/')
out += '\t* %s: ...here.\n' % (new_path)
+ elif os.path.basename(file.path) in generated_files:
+ out += '\t* %s: Regenerate.\n' % (relative_path)
else:
if not no_functions:
for hunk in file: