[gentoo-commits] proj/gcc-patches:master commit in: 3.3.6/gentoo/

[Sergei Trofimovich]

commit:     d4d82b8263f1f25af91e14fd309dbac111c42bf3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 21:33:07 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 21:33:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=d4d82b82

3.3.6: backport gperf inline fix and flag_jni qualifier mismatch

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 3.3.6/gentoo/93_all_gperf-inline.patch | 22 ++++++++++++++++++++++
 3.3.6/gentoo/94_all_flag_jni.patch     | 11 +++++++++++
 3.3.6/gentoo/README.history            |  4 ++++
 3 files changed, 37 insertions(+)

diff --git a/3.3.6/gentoo/93_all_gperf-inline.patch 
b/3.3.6/gentoo/93_all_gperf-inline.patch
new file mode 100644
index 0000000..f99a50e
--- /dev/null
+++ b/3.3.6/gentoo/93_all_gperf-inline.patch
@@ -0,0 +1,22 @@
+--- a/gcc/java/keyword.gperf
++++ b/gcc/java/keyword.gperf
+@@ -33,7 +33,7 @@ static unsigned int hash             PARAMS ((const char *, 
unsigned int));
+ #ifdef __GNUC__
+ __inline
+ #endif
+-const struct java_keyword *java_keyword       PARAMS ((const char *, unsigned 
int));
++static const struct java_keyword *java_keyword        PARAMS ((const char *, 
unsigned int));
+ %%
+ abstract, ABSTRACT_TK
+ default, DEFAULT_TK
+--- a/gcc/java/keyword.h
++++ b/gcc/java/keyword.h
+@@ -33,7 +33,7 @@ static unsigned int hash             PARAMS ((const char *, 
unsigned int));
+ #ifdef __GNUC__
+ __inline
+ #endif
+-const struct java_keyword *java_keyword       PARAMS ((const char *, unsigned 
int));
++static const struct java_keyword *java_keyword        PARAMS ((const char *, 
unsigned int));
+ 
+ #define TOTAL_KEYWORDS 52
+ #define MIN_WORD_LENGTH 2

diff --git a/3.3.6/gentoo/94_all_flag_jni.patch 
b/3.3.6/gentoo/94_all_flag_jni.patch
new file mode 100644
index 0000000..965e0b1
--- /dev/null
+++ b/3.3.6/gentoo/94_all_flag_jni.patch
@@ -0,0 +1,11 @@
+--- a/gcc/java/gjavah.c
++++ b/gcc/java/gjavah.c
+@@ -52,7 +52,7 @@ FILE *out = NULL;
+ static int found_error = 0;
+ 
+ /* Nonzero if we're generating JNI output.  */
+-static int flag_jni = 0;
++int flag_jni = 0;
+ 
+ /* When nonzero, warn when source file is newer than matching class
+    file.  */

diff --git a/3.3.6/gentoo/README.history b/3.3.6/gentoo/README.history
index 46eaa56..45d7c53 100644
--- a/3.3.6/gentoo/README.history
+++ b/3.3.6/gentoo/README.history
@@ -1,3 +1,7 @@
+2              TODO
+       + 93_all_gperf-inline.patch
+       + 94_all_flag_jni.patch
+
 1.11           1 Jun 2019
        + 92_all_ucontext-to-ucontext_t.patch