--- a/make/autoconf/flags-cflags.m4	Thu Mar 01 17:00:23 2018 +0100
+++ b/make/autoconf/flags-cflags.m4	Thu Mar 01 19:28:43 2018 +0100
@@ -191,7 +191,7 @@
       LDFLAGS_WARNINGS_ARE_ERRORS="-Wl,-z,fatal-warnings"
 
       WARNINGS_ENABLE_ALL_CFLAGS="-v -fd -xtransition"
-      WARNINGS_ENABLE_ALL_CXXFLAGS="-+w +w2"
+      WARNINGS_ENABLE_ALL_CXXFLAGS="+w +w2"
 
       DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING"
       DISABLED_WARNINGS_CXX="inllargeuse doubunder notused wemptydecl wunreachable"
@@ -573,11 +573,11 @@
     TOOLCHAIN_FLAGS="-errtags -errfmt"
     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="-mt $TOOLCHAIN_FLAGS"
+    TOOLCHAIN_CFLAGS_JDK_CONLY="-xc99=%none -xCC -Xa -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)"
+        -library=stlport4 -mt -features=no%except $TOOLCHAIN_FLAGS"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt"  # add on both CFLAGS
     TOOLCHAIN_CFLAGS_JVM="-qtune=balanced \

--- a/make/hotspot/lib/CompileDtracePostJvm.gmk	Thu Mar 01 17:00:23 2018 +0100
+++ b/make/hotspot/lib/CompileDtracePostJvm.gmk	Thu Mar 01 19:28:43 2018 +0100
@@ -52,6 +52,8 @@
         TOOLCHAIN := $(TOOLCHAIN_BUILD), \
         LDFLAGS := -m64, \
         CFLAGS := -m64 $(JVM_CFLAGS), \
+        DISABLED_WARNINGS_solstudio := hidef nokeyworddefine unknownpragma \
+            w_novirtualdescr, \
         OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \
         OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \
     ))

--- a/make/hotspot/lib/CompileGtest.gmk	Thu Mar 01 17:00:23 2018 +0100
+++ b/make/hotspot/lib/CompileGtest.gmk	Thu Mar 01 19:28:43 2018 +0100
@@ -86,7 +86,9 @@
     DISABLED_WARNINGS_gcc := undef, \
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
         tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
-    DISABLED_WARNINGS_solstudio := identexpected, \
+    DISABLED_WARNINGS_solstudio := hidef inlafteruse inllargeint \
+        nokeyworddefine notemsource unknownpragma w_enumnotused \
+        wnoretvalue w_novirtualdescr w_toomanyenumnotused wvarhidenmem, \
     DISABLED_WARNINGS_CXX_microsoft := 4996, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \