diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-11 00:26:50 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-11 00:26:50 +0100 |
| commit | b2ccc44dfb39775de889ed45d2ebd843ec2abe75 (patch) | |
| tree | dd969926bc2fce7fb77cd630e1d9614e14aea15b /contrib | |
| parent | 08d817df8c6e00032fa5fca6b8c0cb0a123b110a (diff) | |
| parent | a338c5f6114f3b9f2ed067bc7738b405091a76ce (diff) | |
| download | gcc-b2ccc44dfb39775de889ed45d2ebd843ec2abe75.zip gcc-b2ccc44dfb39775de889ed45d2ebd843ec2abe75.tar.gz gcc-b2ccc44dfb39775de889ed45d2ebd843ec2abe75.tar.bz2 | |
Merge commit 'f3f6ff7b16861cd0651eccff14689536550762ae^' into HEAD
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 8 | ||||
| -rwxr-xr-x | contrib/gcc_update | 1 | ||||
| -rwxr-xr-x | contrib/mklog.py | 8 |
3 files changed, 14 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 0baf78d..105726c 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,11 @@ +2023-08-29 Lehua Ding <lehua.ding@rivai.ai> + + * mklog.py: Fix bugs. + +2023-08-16 Andrew Pinski <apinski@marvell.com> + + * gcc_update: Add libstdc++-v3/include/bits/version.h. + 2023-07-13 Lehua Ding <lehua.ding@rivai.ai> * mklog.py: Add --append option. diff --git a/contrib/gcc_update b/contrib/gcc_update index 1bfc67a..1d7bfab 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -182,6 +182,7 @@ libphobos/config.h.in: libphobos/configure.ac libphobos/aclocal.m4 libphobos/configure: libphobos/configure.ac libphobos/aclocal.m4 libphobos/src/Makefile.in: libphobos/src/Makefile.am libphobos/aclocal.m4 libphobos/testsuite/Makefile.in: libphobos/testsuite/Makefile.am libphobos/aclocal.m4 +libstdc++-v3/include/bits/version.h: libstdc++-v3/include/bits/version.def libstdc++-v3/include/bits/version.tpl # Top level Makefile.in: Makefile.tpl Makefile.def configure: configure.ac config/acx.m4 diff --git a/contrib/mklog.py b/contrib/mklog.py index 4967808..705a848 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -398,7 +398,8 @@ if __name__ == '__main__': args.fill_up_bug_titles, args.pr_numbers) if args.append: if (not args.input): - raise Exception("`-a or --append` option not support standard input") + raise Exception("`-a or --append` option not support standard " + "input") lines = [] with open(args.input, 'r', newline='\n') as f: # 1 -> not find the possible start of diff log @@ -408,13 +409,14 @@ if __name__ == '__main__': for line in f: if maybe_diff_log == 1 and line == "---\n": maybe_diff_log = 2 - elif maybe_diff_log == 2 and \ - re.match("\s[^\s]+\s+\|\s\d+\s[+\-]+\n", line): + elif (maybe_diff_log == 2 and + re.match(r"\s[^\s]+\s+\|\s+\d+\s[+\-]+\n", line)): lines += [output, "---\n", line] maybe_diff_log = 3 else: # the possible start is not the true start. if maybe_diff_log == 2: + lines.append("---\n") maybe_diff_log = 1 lines.append(line) with open(args.input, "w") as f: |