changeset 12111:97cd0eaed840

Merge
author mlarsson
date Wed, 05 Oct 2016 12:28:35 +0200
parents f6ef8a82b3cc 99ba38bd0e7c
children 062429f3c065
files
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/CompileJvm.gmk	Thu Sep 08 15:57:57 2016 +0200
+++ b/make/lib/CompileJvm.gmk	Wed Oct 05 12:28:35 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, \
--- a/make/lib/JvmFeatures.gmk	Thu Sep 08 15:57:57 2016 +0200
+++ b/make/lib/JvmFeatures.gmk	Wed Oct 05 12:28:35 2016 +0200
@@ -59,6 +59,10 @@
 
 ifeq ($(call check-jvm-feature, minimal), true)
   JVM_CFLAGS_FEATURES += -DMINIMAL_JVM -DVMTYPE=\"Minimal\"
+  ifeq ($(OPENJDK_TARGET_OS), linux)
+    # Override the default -g with a more liberal strip policy for the minimal JVM
+    JVM_STRIPFLAGS := --strip-unneeded
+  endif
 endif
 
 ifeq ($(call check-jvm-feature, dtrace), true)