diff --git a/gcc10.patch b/gcc10.patch index 4d18f9a..61c6513 100644 --- a/gcc10.patch +++ b/gcc10.patch @@ -1,6 +1,18 @@ ---- openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c -+++ openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c -@@ -31,7 +31,7 @@ static agentEnv * env; +diff -urEbwB openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h +--- openjdk.orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-06-26 09:42:59.047804301 +0200 ++++ openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-06-26 09:43:05.211851045 +0200 +@@ -265,6 +265,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 -urEbwB openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c +--- openjdk.orig/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c 2020-06-26 09:43:37.492095839 +0200 ++++ openjdk/openj9/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c 2020-06-26 09:41:42.243256411 +0200 +@@ -31,7 +31,7 @@ static jvmtiExtensionFunction subscribe = NULL; static jvmtiExtensionFunction unsubscribe = NULL; @@ -9,7 +21,7 @@ volatile static jint bufferCount = 0; volatile static int alarmed = 0; -@@ -131,7 +131,7 @@ Java_com_ibm_jvmti_tests_verboseGC_vgc001_tryRegisterVerboseGCSubscriber(JNIEnv +@@ -131,7 +131,7 @@ jvmtiError err; jvmtiEnv *jvmti_env = env->jvmtiEnv; @@ -18,7 +30,7 @@ if (err != JVMTI_ERROR_NONE) { error(env, err, "RegisterVerboseGCSubscriber failed"); return FALSE; -@@ -147,7 +147,7 @@ Java_com_ibm_jvmti_tests_verboseGC_vgc001_tryDeregisterVerboseGCSubscriber(JNIEn +@@ -147,7 +147,7 @@ jvmtiError err = JVMTI_ERROR_NONE; jvmtiEnv *jvmti_env = env->jvmtiEnv; diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 25adbb7..06de327 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -369,7 +369,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch205 -p1 %patch210 -%patch211 +%patch211 -p1 %patch1 -p1 %patch2 -p1