From 1449424816c8f4df725c15498d1d7dc72f031e97 Mon Sep 17 00:00:00 2001
From: Maximilian Downey Twiss <creatorsmithmdt@gmail.com>
Date: Thu, 17 Nov 2022 13:54:51 +1100
Subject: [PATCH 05/56] contrib: Re-add Java entries.
contrib/ChangeLog:
* gcc-changelog/git_commit.py: Re-add gcc/java and libjava.
* gcc_update: Likewise.
* patch_tester.sh: Re-add libjava.
* update-copyright.py: Likewise.
* warn_summary: Re-add gcc/java.
---
contrib/gcc-changelog/git_commit.py | 2 ++
contrib/gcc_update | 8 ++++++++
contrib/patch_tester.sh | 1 +
contrib/update-copyright.py | 25 +++++++++++++++++++++++++
contrib/warn_summary | 4 ++--
5 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 3bd671011f2..dd671f720fc 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -39,6 +39,7 @@ default_changelog_locations = {
'gcc/d',
'gcc/fortran',
'gcc/go',
+ 'gcc/java',
'gcc/jit',
'gcc/lto',
'gcc/objc',
@@ -66,6 +67,7 @@ default_changelog_locations = {
'libhsail-rt',
'libiberty',
'libitm',
+ 'libjava',
'libobjc',
'libphobos',
'libquadmath',
diff --git a/contrib/gcc_update b/contrib/gcc_update
index c5630df6c4c..cf55b88dafb 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -96,6 +96,7 @@ gcc/config/rs6000/fusion.md: gcc/config/rs6000/genfusion.pl
gcc/cp/cfns.h: gcc/cp/cfns.gperf
gcc/cp/std-name-hint.h: gcc/cp/std-name-hint.gperf
gcc/cp/std-name-hint.gperf: gcc/cp/cxxapi-data.csv
+gcc/java/keyword.h: gcc/java/keyword.gperf
# testsuite
# Without this, _Pragma3.c can have a false negative.
gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h
@@ -132,6 +133,13 @@ libquadmath/configure: libquadmath/configure.ac libquadmath/aclocal.m4
libquadmath/aclocal.m4: libquadmath/configure.ac libquadmath/acinclude.m4
libquadmath/Makefile.in: libquadmath/Makefile.am libquadmath/configure.ac libgfortran/aclocal.m4
libgfortran/configure: libgfortran/configure.ac libgfortran/aclocal.m4
+libjava/aclocal.m4: libjava/configure.ac
+libjava/Makefile.in: libjava/Makefile.am libjava/configure.ac libjava/aclocal.m4
+libjava/configure: libjava/configure.ac libjava/aclocal.m4
+libjava/libltdl/aclocal.m4: libjava/libltdl/configure.ac libjava/libltdl/acinclude.m4
+libjava/libltdl/Makefile.in: libjava/libltdl/Makefile.am libjava/libltdl/configure.ac libjava/libltdl/aclocal.m4
+libjava/libltdl/configure: libjava/libltdl/configure.ac libjava/libltdl/aclocal.m4
+libjava/libltdl/config-h.in: libjava/libltdl/configure.ac libjava/libltdl/aclocal.m4
libcody/configure: libcody/configure.ac libcody/config.m4
libcpp/aclocal.m4: libcpp/configure.ac
libcpp/Makefile.in: libcpp/configure.ac libcpp/aclocal.m4
diff --git a/contrib/patch_tester.sh b/contrib/patch_tester.sh
index 56bb1ebf9b7..74b8e9e8ce1 100755
--- a/contrib/patch_tester.sh
+++ b/contrib/patch_tester.sh
@@ -191,6 +191,7 @@ gcc/testsuite/g++/g++.sum
gcc/testsuite/objc/objc.sum
$TARGET/libstdc++-v3/testsuite/libstdc++.sum
$TARGET/libffi/testsuite/libffi.sum
+$TARGET/libjava/testsuite/libjava.sum
$TARGET/libgomp/testsuite/libgomp.sum
$TARGET/libmudflap/testsuite/libmudflap.sum"
COMPILERS="gcc/cc1
diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
index 76614ffc4ea..09e3d12d763 100755
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -631,6 +631,29 @@ class LibGCCFilter (GenericFilter):
'soft-fp',
])
+class LibJavaFilter (GenericFilter):
+ def __init__ (self):
+ GenericFilter.__init__ (self)
+
+ self.skip_dirs |= set ([
+ # Handled separately.
+ 'testsuite',
+
+ # Not really part of the library
+ 'contrib',
+
+ # Imported from upstream
+ 'classpath',
+ 'libltdl',
+ ])
+
+ def get_line_filter (self, dir, filename):
+ if filename == 'NameDecoder.h':
+ return re.compile ('.*NAME_COPYRIGHT')
+ if filename == 'ICC_Profile.h':
+ return re.compile ('.*icSigCopyrightTag')
+ return GenericFilter.get_line_filter (self, dir, filename)
+
class LibPhobosFilter (GenericFilter):
def __init__ (self):
GenericFilter.__init__ (self)
@@ -759,6 +782,8 @@ class GCCCmdLine (CmdLine):
self.add_dir ('libgomp')
self.add_dir ('libiberty')
self.add_dir ('libitm')
+ self.add_dir ('libjava', LibJavaFilter())
+ self.add_dir (os.path.join ('libjava', 'testsuite'), TestsuiteFilter())
self.add_dir ('libobjc')
self.add_dir ('libphobos', LibPhobosFilter())
self.add_dir ('libquadmath')
diff --git a/contrib/warn_summary b/contrib/warn_summary
index d4c8b6cdb19..0cfa969dafd 100755
--- a/contrib/warn_summary
+++ b/contrib/warn_summary
@@ -3,7 +3,7 @@
# This script parses the output of a gcc bootstrap when using warning
# flags and determines various statistics.
#
-# usage: warn_summary [-llf] [-s stage] [-nosub|-ch|-cp|-f|-fortran|-ada|-intl|-fixinc]
+# usage: warn_summary [-llf] [-s stage] [-nosub|-ch|-cp|-f|-fortran|-java|-ada|-intl|-fixinc]
# [-pass|-wpass] [file(s)]
#
# -llf
@@ -19,7 +19,7 @@
#
# -nosub
# Only show warnings from the gcc top level directory.
-# -ch|-cp|-f|-fortran|-ada|-intl|-fixinc
+# -ch|-cp|-f|-fortran|-java|-ada|-intl|-fixinc
# Only show warnings from the specified gcc subdirectory.
# These override each other so only the last one passed takes effect.
#
--
2.38.1
