/hg/icedtea8-forest/hotspot: PR1368: Ensure debug data is availa...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jan 25 16:31:30 UTC 2016
changeset be477dd4629d in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=be477dd4629d
author: andrew
date: Mon Jan 11 17:16:42 2016 +0000
PR1368: Ensure debug data is available for all libraries and binaries without redundant files
diffstat:
make/aix/makefiles/defs.make | 6 ++++++
make/aix/makefiles/jsig.make | 2 ++
make/aix/makefiles/saproc.make | 4 ++++
make/aix/makefiles/vm.make | 2 ++
make/bsd/makefiles/defs.make | 11 +++++++++++
make/bsd/makefiles/jsig.make | 2 ++
make/bsd/makefiles/saproc.make | 2 ++
make/bsd/makefiles/vm.make | 2 ++
make/linux/makefiles/defs.make | 10 ++++++++++
make/linux/makefiles/jsig.make | 4 ++++
make/linux/makefiles/saproc.make | 4 ++++
make/linux/makefiles/vm.make | 4 ++++
make/solaris/makefiles/defs.make | 7 +++++++
make/solaris/makefiles/jsig.make | 4 ++++
make/solaris/makefiles/saproc.make | 4 ++++
make/solaris/makefiles/vm.make | 4 ++++
make/windows/makefiles/debug.make | 2 ++
make/windows/makefiles/defs.make | 6 ++++++
make/windows/makefiles/fastdebug.make | 2 ++
make/windows/makefiles/product.make | 2 ++
make/windows/makefiles/sa.make | 2 ++
21 files changed, 86 insertions(+), 0 deletions(-)
diffs (truncated from 666 to 500 lines):
diff -r e04f994581e2 -r be477dd4629d make/aix/makefiles/defs.make
--- a/make/aix/makefiles/defs.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/aix/makefiles/defs.make Mon Jan 11 17:16:42 2016 +0000
@@ -186,12 +186,14 @@
# client and server subdirectories have symbolic links to ../libjsig.so
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+#ifneq ($(STRIP_POLICY),no_strip)
# ifeq ($(ZIP_DEBUGINFO_FILES),1)
# EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
# else
# EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
# endif
#endif
+#endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
@@ -200,24 +202,28 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
# ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+# ifneq ($(STRIP_POLICY),no_strip)
# ifeq ($(ZIP_DEBUGINFO_FILES),1)
# EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
# else
# EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
# endif
# endif
+# endif
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
# ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+# ifneq ($(STRIP_POLICY),no_strip)
# ifeq ($(ZIP_DEBUGINFO_FILES),1)
# EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
# else
# EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
# endif
# endif
+# endif
endif
# Serviceability Binaries
diff -r e04f994581e2 -r be477dd4629d make/aix/makefiles/jsig.make
--- a/make/aix/makefiles/jsig.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/aix/makefiles/jsig.make Mon Jan 11 17:16:42 2016 +0000
@@ -60,6 +60,7 @@
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+#ifneq ($(STRIP_POLICY),no_strip)
# $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
# ifeq ($(STRIP_POLICY),all_strip)
@@ -75,6 +76,7 @@
# $(RM) $(LIBJSIG_DEBUGINFO)
# endif
#endif
+#endif
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -r e04f994581e2 -r be477dd4629d make/aix/makefiles/saproc.make
--- a/make/aix/makefiles/saproc.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/aix/makefiles/saproc.make Mon Jan 11 17:16:42 2016 +0000
@@ -88,8 +88,10 @@
-o $@ \
-lthread_db
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -99,8 +101,10 @@
endif
endif
ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
$(RM) $(LIBSAPROC_DEBUGINFO)
+ endif
endif
endif
diff -r e04f994581e2 -r be477dd4629d make/aix/makefiles/vm.make
--- a/make/aix/makefiles/vm.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/aix/makefiles/vm.make Mon Jan 11 17:16:42 2016 +0000
@@ -330,6 +330,7 @@
# }
#ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+#ifneq ($(STRIP_POLICY),no_strip)
# $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
# ifeq ($(STRIP_POLICY),all_strip)
@@ -345,6 +346,7 @@
# $(RM) $(LIBJVM_DEBUGINFO)
# endif
#endif
+#endif
DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
diff -r e04f994581e2 -r be477dd4629d make/bsd/makefiles/defs.make
--- a/make/bsd/makefiles/defs.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/bsd/makefiles/defs.make Mon Jan 11 17:16:42 2016 +0000
@@ -269,6 +269,7 @@
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
else
@@ -279,6 +280,7 @@
endif
endif
endif
+endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
@@ -289,6 +291,7 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
else
@@ -299,6 +302,7 @@
endif
endif
endif
+ endif
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -306,6 +310,7 @@
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
else
@@ -316,6 +321,7 @@
endif
endif
endif
+ endif
endif
ifeq ($(JVM_VARIANT_MINIMAL1),true)
@@ -329,6 +335,7 @@
$(EXPORT_LIB_DIR)/sa-jdi.jar
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
else
@@ -346,6 +353,7 @@
$(EXPORT_LIB_DIR)/sa-jdi.jar
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
else
@@ -356,6 +364,7 @@
endif
endif
endif
+endif
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
@@ -398,6 +407,7 @@
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.diz
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.diz
@@ -410,6 +420,7 @@
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM
endif
endif
+ endif
endif
endif
diff -r e04f994581e2 -r be477dd4629d make/bsd/makefiles/jsig.make
--- a/make/bsd/makefiles/jsig.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/bsd/makefiles/jsig.make Mon Jan 11 17:16:42 2016 +0000
@@ -64,6 +64,7 @@
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(OS_VENDOR), Darwin)
$(DSYMUTIL) $@
ifeq ($(ZIP_DEBUGINFO_FILES),1)
@@ -87,6 +88,7 @@
endif
endif
endif
+endif
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -r e04f994581e2 -r be477dd4629d make/bsd/makefiles/saproc.make
--- a/make/bsd/makefiles/saproc.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/bsd/makefiles/saproc.make Mon Jan 11 17:16:42 2016 +0000
@@ -137,6 +137,7 @@
-o $@ \
$(SALIBS)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(OS_VENDOR), Darwin)
$(DSYMUTIL) $@
ifeq ($(ZIP_DEBUGINFO_FILES),1)
@@ -160,6 +161,7 @@
endif
endif
endif
+endif
install_saproc: $(BUILDLIBSAPROC)
@echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"
diff -r e04f994581e2 -r be477dd4629d make/bsd/makefiles/vm.make
--- a/make/bsd/makefiles/vm.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/bsd/makefiles/vm.make Mon Jan 11 17:16:42 2016 +0000
@@ -342,6 +342,7 @@
}
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(OS_VENDOR), Darwin)
$(DSYMUTIL) $@
ifeq ($(ZIP_DEBUGINFO_FILES),1)
@@ -365,6 +366,7 @@
endif
endif
endif
+endif
DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
diff -r e04f994581e2 -r be477dd4629d make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/linux/makefiles/defs.make Mon Jan 11 17:16:42 2016 +0000
@@ -252,12 +252,14 @@
# client and server subdirectories have symbolic links to ../libjsig.so
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
else
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
endif
endif
+endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
@@ -266,24 +268,28 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
else
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
endif
endif
+ endif
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
else
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
endif
endif
+ endif
endif
ifeq ($(JVM_VARIANT_MINIMAL1),true)
@@ -291,12 +297,14 @@
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
else
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
endif
endif
+ endif
endif
# Serviceability Binaries
@@ -308,6 +316,7 @@
ADD_SA_BINARIES/aarch64 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
@@ -316,6 +325,7 @@
ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
endif
endif
+endif
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
ADD_SA_BINARIES/arm =
diff -r e04f994581e2 -r be477dd4629d make/linux/makefiles/jsig.make
--- a/make/linux/makefiles/jsig.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/linux/makefiles/jsig.make Mon Jan 11 17:16:42 2016 +0000
@@ -56,8 +56,10 @@
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -66,10 +68,12 @@
# implied else here is no stripping at all
endif
endif
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
$(RM) $(LIBJSIG_DEBUGINFO)
endif
+ endif
endif
install_jsig: $(LIBJSIG)
diff -r e04f994581e2 -r be477dd4629d make/linux/makefiles/saproc.make
--- a/make/linux/makefiles/saproc.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/linux/makefiles/saproc.make Mon Jan 11 17:16:42 2016 +0000
@@ -98,8 +98,10 @@
-o $@ \
-lthread_db
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -109,8 +111,10 @@
endif
endif
ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
$(RM) $(LIBSAPROC_DEBUGINFO)
+ endif
endif
endif
diff -r e04f994581e2 -r be477dd4629d make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/linux/makefiles/vm.make Mon Jan 11 17:16:42 2016 +0000
@@ -417,8 +417,10 @@
}
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -427,10 +429,12 @@
# implied else here is no stripping at all
endif
endif
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
$(RM) $(LIBJVM_DEBUGINFO)
endif
+ endif
endif
DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
diff -r e04f994581e2 -r be477dd4629d make/solaris/makefiles/defs.make
--- a/make/solaris/makefiles/defs.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/solaris/makefiles/defs.make Mon Jan 11 17:16:42 2016 +0000
@@ -226,12 +226,14 @@
# client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
else
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
endif
endif
+endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
@@ -246,6 +248,7 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
endif
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.diz
@@ -264,6 +267,7 @@
endif
endif
endif
+ endif
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
@@ -275,6 +279,7 @@
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
endif
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.diz
@@ -293,10 +298,12 @@
endif
endif
endif
+ endif
endif
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
else
diff -r e04f994581e2 -r be477dd4629d make/solaris/makefiles/jsig.make
--- a/make/solaris/makefiles/jsig.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/solaris/makefiles/jsig.make Mon Jan 11 17:16:42 2016 +0000
@@ -52,8 +52,10 @@
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -62,10 +64,12 @@
# implied else here is no stripping at all
endif
endif
+ ifneq ($(STRIP_POLICY),no_strip)
ifeq ($(ZIP_DEBUGINFO_FILES),1)
$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
$(RM) $(LIBJSIG_DEBUGINFO)
endif
+ endif
endif
install_jsig: $(LIBJSIG)
diff -r e04f994581e2 -r be477dd4629d make/solaris/makefiles/saproc.make
--- a/make/solaris/makefiles/saproc.make Tue Dec 08 03:10:43 2015 +0000
+++ b/make/solaris/makefiles/saproc.make Mon Jan 11 17:16:42 2016 +0000
More information about the distro-pkg-dev
mailing list