diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-08-19 23:32:38 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-08-19 23:32:38 +0000 |
| commit | b3575ba0d1116da06b2423ff37818e7bc04ab7c7 (patch) | |
| tree | fc9e0b67d52706f3231cfb2e08356262120aa1ac /java/openjdk11 | |
| parent | devel/ocl-icd: FIx build with -fno-common (diff) | |
Add upstream patches to build with "-fno-common".
This is default with Clang 11 and GCC 10.
https://hg.openjdk.java.net/jdk-updates/jdk11u/rev/3660248422f4
https://hg.openjdk.java.net/jdk-updates/jdk11u/rev/371bbe373ae0
Notes
Notes:
svn path=/head/; revision=545469
Diffstat (limited to 'java/openjdk11')
4 files changed, 43 insertions, 0 deletions
diff --git a/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.c b/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.c new file mode 100644 index 000000000000..cf53ec78cdeb --- /dev/null +++ b/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.c @@ -0,0 +1,10 @@ +--- src/java.base/unix/native/libjava/childproc.c.orig 2020-07-15 18:00:08 UTC ++++ src/java.base/unix/native/libjava/childproc.c +@@ -33,6 +33,7 @@ + + #include "childproc.h" + ++const char * const *parentPathv; + + ssize_t + restartableWrite(int fd, const void *buf, size_t count) diff --git a/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.h b/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.h new file mode 100644 index 000000000000..48a5ecca3235 --- /dev/null +++ b/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.h @@ -0,0 +1,11 @@ +--- src/java.base/unix/native/libjava/childproc.h.orig 2020-07-15 18:00:08 UTC ++++ src/java.base/unix/native/libjava/childproc.h +@@ -118,7 +118,7 @@ typedef struct _SpawnInfo { + * The cached and split version of the JDK's effective PATH. + * (We don't support putenv("PATH=...") in native code) + */ +-const char * const *parentPathv; ++extern const char * const *parentPathv; + + ssize_t restartableWrite(int fd, const void *buf, size_t count); + int restartableDup2(int fd_from, int fd_to); diff --git a/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.c b/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.c new file mode 100644 index 000000000000..eca254caed05 --- /dev/null +++ b/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.c @@ -0,0 +1,12 @@ +--- src/java.security.jgss/share/native/libj2gss/NativeFunc.c.orig 2020-07-15 18:00:08 UTC ++++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c +@@ -27,6 +27,9 @@ + #include <stdlib.h> + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; diff --git a/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.h b/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.h new file mode 100644 index 000000000000..91c0ad5a25a4 --- /dev/null +++ b/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.h @@ -0,0 +1,10 @@ +--- src/java.security.jgss/share/native/libj2gss/NativeFunc.h.orig 2020-07-15 18:00:08 UTC ++++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h +@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif |