diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..4d18f9a
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,29 @@
+--- 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;
+ static jvmtiExtensionFunction subscribe  = NULL;
+ static jvmtiExtensionFunction unsubscribe  = NULL;
+ 
+-void *subscriptionID;
++void *subscriptionID1;
+ volatile static jint bufferCount = 0;
+ volatile static int alarmed = 0;
+ 
+@@ -131,7 +131,7 @@ Java_com_ibm_jvmti_tests_verboseGC_vgc001_tryRegisterVerboseGCSubscriber(JNIEnv
+ 	jvmtiError err;
+ 	jvmtiEnv *jvmti_env = env->jvmtiEnv;
+ 
+-	err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID);
++	err = subscribe(jvmti_env, "vgc001 subscriber", vgc001Callback, vgc001Alarm, NULL, &subscriptionID1);
+ 	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
+ 	jvmtiError err = JVMTI_ERROR_NONE;
+ 	jvmtiEnv *jvmti_env = env->jvmtiEnv;
+ 
+-	err = unsubscribe(jvmti_env, subscriptionID, NULL);
++	err = unsubscribe(jvmti_env, subscriptionID1, NULL);
+ 	if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_NOT_AVAILABLE) {
+ 		error(env, err, "DeregisterVerboseGCSubscriber failed");
+ 		return -1;
diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index 743d91e..25adbb7 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -126,7 +126,11 @@ Patch202:       system-libpng.patch
 Patch203:       system-lcms.patch
 Patch205:       link-with-as-needed.patch
 
+Patch210:       openj9-no-werror.patch
+Patch211:       gcc10.patch
+
 Patch300:       alternative-path-to-tzdb_dat.patch
+
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -364,6 +368,9 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch203 -p1
 %patch205 -p1
 
+%patch210
+%patch211
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
diff --git a/openj9-no-werror.patch b/openj9-no-werror.patch
new file mode 100644
index 0000000..6600fce
--- /dev/null
+++ b/openj9-no-werror.patch
@@ -0,0 +1,48 @@
+--- openj9/runtime/makelib/targets.mk.linux.inc.ftl	2020-04-15 02:48:00.000000000 +0200
++++ openj9/runtime/makelib/targets.mk.linux.inc.ftl	2020-06-26 07:37:18.255678364 +0200
+@@ -459,18 +459,18 @@
+   ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS
+     <#if uma.spec.processor.ppc>
+       <#if uma.spec.flags.env_gcc.enabled>
+-        CFLAGS += -Wreturn-type -Werror
+-        CXXFLAGS += -Wreturn-type -Werror
++        CFLAGS += -Wreturn-type
++        CXXFLAGS += -Wreturn-type
+       <#else>
+         CFLAGS += -qhalt=w
+         CXXFLAGS += -qhalt=w
+       </#if>
+       ifdef USE_PPC_GCC
+-        PPC_GCC_CXXFLAGS += -Wreturn-type -Werror
++        PPC_GCC_CXXFLAGS += -Wreturn-type
+       endif
+     <#else>
+-      CFLAGS += -Wimplicit -Wreturn-type -Werror
+-      CXXFLAGS += -Wreturn-type -Werror
++      CFLAGS += -Wimplicit -Wreturn-type
++      CXXFLAGS += -Wreturn-type
+     </#if>
+   endif
+ endif
+--- omr/omrmakefiles/rules.linux.mk	2020-04-14 14:43:05.000000000 +0200
++++ omr/omrmakefiles/rules.linux.mk	2020-06-26 08:19:16.264774446 +0200
+@@ -348,15 +348,15 @@
+ ifeq ($(OMR_WARNINGS_AS_ERRORS),1)
+     ifeq (ppc,$(OMR_HOST_ARCH))
+         ifeq (gcc,$(OMR_TOOLCHAIN))
+-            GLOBAL_CFLAGS += -Wreturn-type -Werror
+-            GLOBAL_CXXFLAGS += -Wreturn-type -Werror
++            GLOBAL_CFLAGS += -Wreturn-type
++            GLOBAL_CXXFLAGS += -Wreturn-type
+         else
+             GLOBAL_CFLAGS += -qhalt=w
+             GLOBAL_CXXFLAGS += -qhalt=w
+         endif
+     else
+-        GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type -Werror
+-        GLOBAL_CXXFLAGS+=-Wreturn-type -Werror
++        GLOBAL_CFLAGS+=-Wimplicit -Wreturn-type
++        GLOBAL_CXXFLAGS+=-Wreturn-type
+     endif
+ endif
+