diff options
author | robm <none@none> | 2018-07-06 07:33:25 -0700 |
---|---|---|
committer | robm <none@none> | 2018-07-06 07:33:25 -0700 |
commit | ac0850e25a3fdb409bb087ce76960a02d76e088a (patch) | |
tree | 9e265f78c39153dd2aab4797543369ba29c2dcb2 | |
parent | 7297ff74f0f9c5350ad68896adb6470a199eb932 (diff) | |
parent | 62f9d2fc248fc4ac1dcc8e0bd369988579ea869a (diff) | |
download | jdk8u_hotspot-ac0850e25a3fdb409bb087ce76960a02d76e088a.tar.gz |
Merge
-rw-r--r-- | make/linux/makefiles/jsig.make | 5 | ||||
-rw-r--r-- | make/linux/makefiles/saproc.make | 5 | ||||
-rw-r--r-- | make/linux/makefiles/vm.make | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/make/linux/makefiles/jsig.make b/make/linux/makefiles/jsig.make index be5456569..0a0b61675 100644 --- a/make/linux/makefiles/jsig.make +++ b/make/linux/makefiles/jsig.make @@ -57,14 +57,15 @@ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ $(QUIETLY) $(STRIP) $@ else ifeq ($(STRIP_POLICY),min_strip) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ $(QUIETLY) $(STRIP) -g $@ - # implied else here is no stripping at all endif + # implied else here is no stripping at all endif ifeq ($(ZIP_DEBUGINFO_FILES),1) $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) diff --git a/make/linux/makefiles/saproc.make b/make/linux/makefiles/saproc.make index 9bd8ba259..06b2cee6e 100644 --- a/make/linux/makefiles/saproc.make +++ b/make/linux/makefiles/saproc.make @@ -100,14 +100,15 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) -lthread_db ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ $(QUIETLY) $(STRIP) $@ else ifeq ($(STRIP_POLICY),min_strip) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ $(QUIETLY) $(STRIP) -g $@ - # implied else here is no stripping at all endif + # implied else here is no stripping at all endif ifeq ($(ZIP_DEBUGINFO_FILES),1) $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) diff --git a/make/linux/makefiles/vm.make b/make/linux/makefiles/vm.make index 72f8d1157..9ae2d3e3b 100644 --- a/make/linux/makefiles/vm.make +++ b/make/linux/makefiles/vm.make @@ -358,14 +358,15 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ $(QUIETLY) $(STRIP) $@ else ifeq ($(STRIP_POLICY),min_strip) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ $(QUIETLY) $(STRIP) -g $@ - # implied else here is no stripping at all endif + # implied else here is no stripping at all endif ifeq ($(ZIP_DEBUGINFO_FILES),1) $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) |