--- a/hotspot/make/lib/CompileJvm.gmk Fri Apr 29 15:23:15 2016 +0200
+++ b/hotspot/make/lib/CompileJvm.gmk Wed Oct 05 11:05:18 2016 +0200
@@ -190,6 +190,11 @@
JVM_OPTIMIZATION ?= HIGHEST_JVM
+# Need to set JVM_STRIPFLAGS to the default value from SPEC since the STRIPFLAGS
+# parameter to SetupNativeCompilation allows an empty value to override the
+# default.
+JVM_STRIPFLAGS ?= $(STRIPFLAGS)
+
################################################################################
# Now set up the actual compilation of the main hotspot native library
@@ -219,6 +224,7 @@
MAPFILE := $(JVM_MAPFILE), \
USE_MAPFILE_FOR_SYMBOLS := true, \
STRIP_SYMBOLS := $(JVM_STRIP_SYMBOLS), \
+ STRIPFLAGS := $(JVM_STRIPFLAGS), \
EMBED_MANIFEST := true, \
RC_FLAGS := $(JVM_RCFLAGS), \
VERSIONINFO_RESOURCE := $(HOTSPOT_TOPDIR)/src/os/windows/vm/version.rc, \