--- a/make/hotspot/lib/CompileDtracePostJvm.gmk	Mon Mar 05 22:45:57 2018 +0100
+++ b/make/hotspot/lib/CompileDtracePostJvm.gmk	Mon Mar 05 23:08:36 2018 +0100
@@ -52,8 +52,8 @@
         TOOLCHAIN := $(TOOLCHAIN_BUILD), \
         LDFLAGS := -m64, \
         CFLAGS := -m64 $(JVM_CFLAGS), \
-        DISABLED_WARNINGS_solstudio := hidef nokeyworddefine unknownpragma \
-            w_novirtualdescr doubunder wunreachable,, \
+        DISABLED_WARNINGS_solstudio := hidef w_novirtualdescr unknownpragma \
+            doubunder nokeyworddefine wunreachable, \
         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	Mon Mar 05 22:45:57 2018 +0100
+++ b/make/hotspot/lib/CompileGtest.gmk	Mon Mar 05 23:08:36 2018 +0100
@@ -90,10 +90,7 @@
         array-bounds narrowing empty-body unused-but-set-parameter undef, \
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
         tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
-    DISABLED_WARNINGS_solstudio := hidef inlafteruse \
-        unknownpragma w_enumnotused \
-        wnoretvalue w_novirtualdescr w_toomanyenumnotused wvarhidenmem \
-        doubunder wunreachable, \
+    DISABLED_WARNINGS_solstudio := $(BUILD_LIBJVM_DISABLED_WARNINGS_solstudio), \
     DISABLED_WARNINGS_CXX_microsoft := 4996, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \

--- a/make/hotspot/lib/CompileJvm.gmk	Mon Mar 05 22:45:57 2018 +0100
+++ b/make/hotspot/lib/CompileJvm.gmk	Mon Mar 05 23:08:36 2018 +0100
@@ -232,10 +232,9 @@
         maybe-uninitialized logical-op \
         implicit-fallthrough expansion-to-defined, \
     DISABLED_WARNINGS_clang := tautological-compare, \
-    DISABLED_WARNINGS_solstudio := hidef inlafteruse  \
-        unknownpragma w_enumnotused \
-        wnoretvalue w_novirtualdescr w_toomanyenumnotused wvarhidenmem \
-        doubunder wunreachable, \
+    DISABLED_WARNINGS_solstudio := hidef w_novirtualdescr inlafteruse \
+        unknownpragma doubunder w_enumnotused w_toomanyenumnotused \
+        wvarhidenmem wunreachable wnoretvalue, \
     DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
         1540-1088 1500-010, \
     ASFLAGS := $(JVM_ASFLAGS), \