# HG changeset patch
# User ihse
# Date 1571727027 -7200
# Node ID fd8dc801ef3233e8d2a973dd8c208e32a91e0a20
# Parent  8a8ec5db4297437759676ebbe8e62c11dbcb4ff9
Fix merge errors.

diff -r 8a8ec5db4297 -r fd8dc801ef32 make/autoconf/flags-cflags.m4
--- a/make/autoconf/flags-cflags.m4	Thu Oct 17 11:39:48 2019 +0200
+++ b/make/autoconf/flags-cflags.m4	Tue Oct 22 08:50:27 2019 +0200
@@ -578,7 +578,7 @@
     TOOLCHAIN_CFLAGS="-errshort=tags"
 
     TOOLCHAIN_CFLAGS_JDK="-mt $TOOLCHAIN_FLAGS"
-    TOOLCHAIN_CFLAGS_JDK_CONLY="-xc99=%none -xCC -Xa -W0,-noglobal $TOOLCHAIN_CFLAGS" # C only
+    TOOLCHAIN_CFLAGS_JDK_CONLY="-W0,-noglobal $TOOLCHAIN_CFLAGS" # C only
     TOOLCHAIN_CFLAGS_JDK_CXXONLY="-features=no%except -norunpath -xnolib" # CXX only
     TOOLCHAIN_CFLAGS_JVM="-template=no%extdef -features=no%split_init \
         -library=stlport4 -mt -features=no%except $TOOLCHAIN_FLAGS"
diff -r 8a8ec5db4297 -r fd8dc801ef32 make/lib/Lib-java.base.gmk
--- a/make/lib/Lib-java.base.gmk	Thu Oct 17 11:39:48 2019 +0200
+++ b/make/lib/Lib-java.base.gmk	Tue Oct 22 08:50:27 2019 +0200
@@ -72,7 +72,7 @@
     OPTIMIZATION := HIGH, \
     WARNINGS_AS_ERRORS_xlc := false, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    DISABLED_WARNINGS_gcc := format-nonliteral logical-op, \
+    DISABLED_WARNINGS_gcc := format-nonliteral, \
     DISABLED_WARNINGS_gcc := undef, \
     DISABLED_WARNINGS_clang := undef, \
     EXTRA_HEADER_DIRS := \