--- 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), \