diff options
| author | Martin Liska <mliska@suse.cz> | 2022-11-07 08:24:48 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-11-07 08:24:48 +0100 |
| commit | 1b09b78ee61bd921ae78ebd0f7905b95b9e1c903 (patch) | |
| tree | 9c04b59cdd2cd460f0727501d15402d31ffcf5a4 /contrib | |
| parent | 1eb021edb27e26f95cda63df121f6bc951647599 (diff) | |
| parent | c4f8f8afd07680f9e718de1331cd09607bdd9ac8 (diff) | |
| download | gcc-1b09b78ee61bd921ae78ebd0f7905b95b9e1c903.zip gcc-1b09b78ee61bd921ae78ebd0f7905b95b9e1c903.tar.gz gcc-1b09b78ee61bd921ae78ebd0f7905b95b9e1c903.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 14 | ||||
| -rwxr-xr-x | contrib/gcc-changelog/git_commit.py | 1 | ||||
| -rwxr-xr-x | contrib/gcc-changelog/git_update_version.py | 3 | ||||
| -rwxr-xr-x | contrib/gcc_update | 6 | ||||
| -rwxr-xr-x | contrib/update-copyright.py | 1 |
5 files changed, 16 insertions, 9 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 0b65ec4..da85fa8 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,17 @@ +2022-11-06 Jakub Jelinek <jakub@redhat.com> + + * gcc-changelog/git_update_version.py: Add + e4cba49413ca429dc82f6aa2e88129ecb3fdd943 to ignored commits. + +2022-11-04 Thomas Schwinge <thomas@codesourcery.com> + + * gcc-changelog/git_commit.py (default_changelog_locations): + Remove 'liboffloadmic'. + * gcc_update (files_and_dependencies): Remove 'liboffloadmic' + files. + * update-copyright.py (GCCCmdLine): Remove 'liboffloadmic' + comment. + 2022-10-20 Jonathan Wakely <jwakely@redhat.com> Ulrich Drepper <drepper@redhat.com> diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index 7f6ff87..1f6e192 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -67,7 +67,6 @@ default_changelog_locations = { 'libiberty', 'libitm', 'libobjc', - 'liboffloadmic', 'libphobos', 'libquadmath', 'libsanitizer', diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index 074e717..63b63ff 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -33,7 +33,8 @@ IGNORED_COMMITS = ( '04a040d907a83af54e0a98bdba5bfabc0ef4f700', '2e96b5f14e4025691b57d2301d71aa6092ed44bc', '3ab5c8cd03d92bf4ec41e351820349d92fbc40c4', - '86d8e0c0652ef5236a460b75c25e4f7093cc0651') + '86d8e0c0652ef5236a460b75c25e4f7093cc0651', + 'e4cba49413ca429dc82f6aa2e88129ecb3fdd943') FORMAT = '%(asctime)s:%(levelname)s:%(name)s:%(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT, diff --git a/contrib/gcc_update b/contrib/gcc_update index 18c7ec4..c5630df 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -162,12 +162,6 @@ libsanitizer/sanitizer_common/Makefile.in: libsanitizer/sanitizer_common/Makefil libvtv/aclocal.m4: libvtv/configure.ac libvtv/acinclude.m4 libvtv/Makefile.in: libvtv/Makefile.am libvtv/aclocal.m4 libvtv/configure: libvtv/configure.ac libvtv/aclocal.m4 -liboffloadmic/aclocal.m4: liboffloadmic/configure.ac -liboffloadmic/Makefile.in: liboffloadmic/Makefile.am -liboffloadmic/configure: liboffloadmic/configure.ac -liboffloadmic/plugin/aclocal.m4: liboffloadmic/plugin/configure.ac -liboffloadmic/plugin/Makefile.in: liboffloadmic/plugin/Makefile.am -liboffloadmic/plugin/configure: liboffloadmic/plugin/configure.ac libbacktrace/aclocal.m4: libbacktrace/configure.ac libbacktrace/Makefile.in: libbacktrace/Makefile.am libbacktrace/aclocal.m4 libbacktrace/configure: libbacktrace/configure.ac libbacktrace/aclocal.m4 diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py index 2ec2a60..76614ff 100755 --- a/contrib/update-copyright.py +++ b/contrib/update-copyright.py @@ -760,7 +760,6 @@ class GCCCmdLine (CmdLine): self.add_dir ('libiberty') self.add_dir ('libitm') self.add_dir ('libobjc') - # liboffloadmic is imported from upstream. self.add_dir ('libphobos', LibPhobosFilter()) self.add_dir ('libquadmath') # libsanitizer is imported from upstream. |