1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
diff -rauN jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.c jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c
--- jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.c 2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.c 2021-05-19 16:33:32.193463845 +0200
@@ -33,6 +33,7 @@
#include "childproc.h"
+const char * const *parentPathv;
ssize_t
restartableWrite(int fd, const void *buf, size_t count)
diff -rauN jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.h jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h
--- jdk12u-jdk-12.0.2+10/src/java.base/unix/native/libjava/childproc.h 2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.base/unix/native/libjava/childproc.h 2021-05-19 16:33:45.056818223 +0200
@@ -118,7 +118,7 @@
* 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 -rauN jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.c jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
--- jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.c 2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.c 2021-05-19 16:36:27.850415027 +0200
@@ -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 -rauN jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.h jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
--- jdk12u-jdk-12.0.2+10/src/java.security.jgss/share/native/libj2gss/NativeFunc.h 2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/java.security.jgss/share/native/libj2gss/NativeFunc.h 2021-05-19 16:35:59.263702472 +0200
@@ -277,6 +277,6 @@
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
/* global GSS function table */
-GSS_FUNCTION_TABLE_PTR ftab;
+extern GSS_FUNCTION_TABLE_PTR ftab;
#endif
diff -rauN jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/Sctp.h jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h
--- jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/Sctp.h 2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/Sctp.h 2021-05-19 16:37:45.070538192 +0200
@@ -322,12 +322,12 @@
#endif /* __linux__ */
-sctp_getladdrs_func* nio_sctp_getladdrs;
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
-sctp_bindx_func* nio_sctp_bindx;
-sctp_peeloff_func* nio_sctp_peeloff;
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
+extern sctp_bindx_func* nio_sctp_bindx;
+extern sctp_peeloff_func* nio_sctp_peeloff;
jboolean loadSocketExtensionFuncs(JNIEnv* env);
diff -rauN jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/SctpNet.c jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c
--- jdk12u-jdk-12.0.2+10/src/jdk.sctp/unix/native/libsctp/SctpNet.c 2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10-gcc10-default-no-fcommon-patch/src/jdk.sctp/unix/native/libsctp/SctpNet.c 2021-05-19 16:38:27.413938578 +0200
@@ -37,6 +37,13 @@
#include "sun_nio_ch_sctp_SctpNet.h"
#include "sun_nio_ch_sctp_SctpStdSocketOption.h"
+sctp_getladdrs_func* nio_sctp_getladdrs;
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
+sctp_bindx_func* nio_sctp_bindx;
+sctp_peeloff_func* nio_sctp_peeloff;
+
static jclass isaCls = 0;
static jmethodID isaCtrID = 0;
|
