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.

diff --git a/contrib/mklog.py b/contrib/mklog.py
index 1604f05..5c93c70 100755 (executable)
--- 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 (executable)
--- 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.
 
 '''