# HG changeset patch
# User ihse
# Date 1528983259 -7200
# Node ID 8a18c7457c88b4d6c9fdb2b410240c667b78b8a1
# Parent  237de13b25cca09e3ef622d0cc2cf326e4550bbf
Some windows fixes.

diff -r 237de13b25cc -r 8a18c7457c88 make/autoconf/flags-cflags.m4
--- a/make/autoconf/flags-cflags.m4	Thu Jun 14 11:58:17 2018 +0200
+++ b/make/autoconf/flags-cflags.m4	Thu Jun 14 15:34:19 2018 +0200
@@ -158,7 +158,9 @@
       
       # 4061
       #WARNINGS_ENABLE_ALL="-Wall"
-      WARNINGS_ENABLE_ALL="-W4"
+      WARNINGS_ENABLE_ALL="-W3"
+      # W4 and Wall is higher but is too link-like.
+      #WARNINGS_ENABLE_ALL="-W4"
       # 4061, 4062 = enum not handled
       # 4130
       #EVEN_MORE="4054 4055 4057 4100 4127 4131 4132 4152 4201 4204 4206 4210 4232 4244 4255 4263 4264 4295 4302 4306 4311 4324 4366 4388 4512 4548 4555 4574 4800 4986 4987"
@@ -166,7 +168,8 @@
       #DISABLED_WARNINGS_WALL="4061 4062 $INIT_DISABLE"
       RETRY_W4_HOTSPOT="4189 4211 4245 4310 4389 4505 4510 4610 4701 4702 4703 4706"
       RETRY_W4_JDK="4054 4055 4057 4100 4127 4130 4131 4132 4152 4201 4204 4206 4210 4232 4244 4295 4306 4324 4366 4512 4800"
-      DISABLED_WARNINGS="$RETRY_W4_HOTSPOT $RETRY_W4_JDK"
+      DISABLED_WARNINGS="4456"
+      #was: $RETRY_W4_HOTSPOT $RETRY_W4_JDK 4061 4242 4255 4265 4365 4456 4459 4514 4619 4623 4625 4626 4668 4710 4820 5026 5027 5038 5039 4596 4571 4577 4605 4774"
       ;;
     solstudio)
       DISABLE_WARNING_PREFIX="-erroff="
diff -r 237de13b25cc -r 8a18c7457c88 make/hotspot/lib/CompileJvm.gmk
--- a/make/hotspot/lib/CompileJvm.gmk	Thu Jun 14 11:58:17 2018 +0200
+++ b/make/hotspot/lib/CompileJvm.gmk	Thu Jun 14 15:34:19 2018 +0200
@@ -170,6 +170,7 @@
         labelnotused hidef w_novirtualdescr inlafteruse \
         unknownpragma doubunder w_enumnotused w_toomanyenumnotused \
         wvarhidenmem wunreachable wnoretvalue, \
+    DISABLED_WARNINGS_microsoft := 4459, \
     DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
         1540-1088 1500-010, \
     ASFLAGS := $(JVM_ASFLAGS), \
diff -r 237de13b25cc -r 8a18c7457c88 make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Thu Jun 14 11:58:17 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Thu Jun 14 15:34:19 2018 +0200
@@ -515,7 +515,7 @@
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
-      DISABLED_WARNINGS_microsoft := 4267 2220 4244, \
+      DISABLED_WARNINGS_microsoft := 4267 4244 4312, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
   ))