--- a/make/autoconf/flags-cflags.m4	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/autoconf/flags-cflags.m4	Thu Oct 17 11:37:36 2019 +0200
@@ -198,7 +198,8 @@
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
       # -Wall -Wextra does not enable all warnings. We add some more that we
       # consider relevant:
-      WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wundef -Wlogical-op -Winit-self -Wpacked -Wdisabled-optimization -Wtrampolines"
+      # logical-op cannot be used due to https://gcc.gnu.org/bugzilla//show_bug.cgi?id=69602
+      WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wundef -Winit-self -Wpacked -Wdisabled-optimization -Wtrampolines"
       WARNINGS_ENABLE_ADDITIONAL_CXX="-Wc++0x-compat -Wreorder -Wnoexcept -Woverloaded-virtual -Wdelete-non-virtual-dtor -Wwrite-strings -Wstrict-null-sentinel"
 
       WARNINGS_ENABLE_ALL="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"

--- a/make/hotspot/lib/CompileGtest.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/hotspot/lib/CompileGtest.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -86,7 +86,7 @@
         unused-local-typedefs unused-variable address \
         missing-field-initializers unused-but-set-variable char-subscripts \
         array-bounds narrowing empty-body unused-but-set-parameter undef \
-        maybe-uninitialized logical-op \
+        maybe-uninitialized \
         implicit-fallthrough expansion-to-defined, \
     DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang) \
         undef switch format-nonliteral tautological-undefined-compare \

--- a/make/hotspot/lib/CompileJvm.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/hotspot/lib/CompileJvm.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -196,7 +196,7 @@
         unused-local-typedefs unused-variable address \
         missing-field-initializers unused-but-set-variable char-subscripts \
         array-bounds narrowing empty-body unused-but-set-parameter \
-        maybe-uninitialized logical-op \
+        maybe-uninitialized \
         implicit-fallthrough expansion-to-defined strict-overflow sequence-point, \
     DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang) \
         \
@@ -207,7 +207,7 @@
         unknownpragma doubunder w_enumnotused w_toomanyenumnotused \
         wvarhidenmem wunreachable wnoretvalue, \
     DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \
-    DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft), \
+    DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft) \
         \
         4459, \
     ASFLAGS := $(JVM_ASFLAGS), \

--- a/make/lib/Awt2dLibraries.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -607,7 +607,7 @@
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
         type-limits missing-field-initializers implicit-fallthrough \
-        strict-aliasing undef unused-function, \
+        strict-aliasing undef unused-function packed, \
     DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
         maybe-uninitialized class-memaccess, \
     DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \

--- a/make/lib/Lib-java.base.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/lib/Lib-java.base.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -43,7 +43,7 @@
     NAME := net, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    DISABLED_WARNINGS_gcc := format-nonliteral unused-function logical-op, \
+    DISABLED_WARNINGS_gcc := format-nonliteral unused-function, \
     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand \
         format-nonliteral undef, \
     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \

--- a/make/lib/Lib-java.security.jgss.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/lib/Lib-java.security.jgss.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -31,7 +31,7 @@
     NAME := j2gss, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    DISABLED_WARNINGS_gcc := undef logical-op, \
+    DISABLED_WARNINGS_gcc := undef, \
     DISABLED_WARNINGS_clang := undef, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \

--- a/make/lib/Lib-jdk.pack.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/lib/Lib-jdk.pack.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -36,7 +36,7 @@
         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
     CFLAGS_release := -DPRODUCT, \
     EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
-    DISABLED_WARNINGS_gcc := implicit-fallthrough, \
+    DISABLED_WARNINGS_gcc := implicit-fallthrough unused-local-typedefs, \
     DISABLED_WARNINGS_clang := format-nonliteral, \
     DISABLED_WARNINGS_solstudio := wunreachable, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \

--- a/make/lib/Lib-jdk.sctp.gmk	Thu Oct 17 11:07:24 2019 +0200
+++ b/make/lib/Lib-jdk.sctp.gmk	Thu Oct 17 11:37:36 2019 +0200
@@ -34,7 +34,7 @@
         NAME := sctp, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
-        DISABLED_WARNINGS_gcc := undef logical-op, \
+        DISABLED_WARNINGS_gcc := undef, \
         DISABLED_WARNINGS_clang := undef, \
         EXTRA_HEADER_DIRS := \
             $(call GetJavaHeaderDir, java.base) \