make/solaris/makefiles/defs.make

Print this page

        

*** 72,88 **** JDK6_OR_EARLIER=1 endif endif ifeq ($(JDK6_OR_EARLIER),0) ! # Full Debug Symbols is supported on JDK7 or newer ! ifdef ENABLE_FULL_DEBUG_SYMBOLS ! # Only check for Full Debug Symbols support on Solaris if it is ! # specifically enabled. Hopefully, it can be enabled by default ! # once the .debuginfo size issues are worked out. # Default OBJCOPY comes from the SUNWbinutils package: DEF_OBJCOPY=/usr/sfw/bin/gobjcopy ifeq ($(VM_PLATFORM),solaris_amd64) # On Solaris AMD64/X64, gobjcopy is not happy and fails: # --- 72,88 ---- JDK6_OR_EARLIER=1 endif endif ifeq ($(JDK6_OR_EARLIER),0) ! # Full Debug Symbols is supported on JDK7 or newer. ! # Default is enabled with .debuginfo files ZIP'ed to save space. ! ENABLE_FULL_DEBUG_SYMBOLS ?= 1 ! # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) # Default OBJCOPY comes from the SUNWbinutils package: DEF_OBJCOPY=/usr/sfw/bin/gobjcopy ifeq ($(VM_PLATFORM),solaris_amd64) # On Solaris AMD64/X64, gobjcopy is not happy and fails: #
*** 98,116 **** OBJCOPY= else OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) ifneq ($(ALT_OBJCOPY),) _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") - # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif endif ! endif ifeq ($(OBJCOPY),) _JUNK_ := $(shell \ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.") else _JUNK_ := $(shell \ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.") # Library stripping policies for .debuginfo configs: --- 98,118 ---- OBJCOPY= else OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) ifneq ($(ALT_OBJCOPY),) _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif endif ! else ! OBJCOPY= ! endif ifeq ($(OBJCOPY),) _JUNK_ := $(shell \ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.") + ENABLE_FULL_DEBUG_SYMBOLS=0 else _JUNK_ := $(shell \ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.") # Library stripping policies for .debuginfo configs:
*** 119,136 **** # no_strip - does not strip the library at all # # Oracle security policy requires "all_strip". A waiver was granted on # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. # ! DEF_STRIP_POLICY="min_strip" ! ifeq ($(ALT_STRIP_POLICY),) ! STRIP_POLICY=$(DEF_STRIP_POLICY) ! else ! STRIP_POLICY=$(ALT_STRIP_POLICY) ! endif _JUNK_ := $(shell \ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") endif endif JDK_INCLUDE_SUBDIR=solaris --- 121,141 ---- # no_strip - does not strip the library at all # # Oracle security policy requires "all_strip". A waiver was granted on # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. # ! # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. ! # ! STRIP_POLICY ?= min_strip ! _JUNK_ := $(shell \ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") + + ZIP_DEBUGINFO_FILES ?= 1 + + _JUNK_ := $(shell \ + echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)") endif endif JDK_INCLUDE_SUBDIR=solaris
*** 142,153 **** EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ! ifneq ($(OBJCOPY),) EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo endif EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server --- 147,162 ---- EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html # 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) ! 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 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
*** 156,195 **** ifneq ($(BUILD_CLIENT_ONLY),true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) ! ifneq ($(OBJCOPY),) EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo endif endif ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) ! ifneq ($(OBJCOPY),) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo endif ifneq ($(BUILD_CLIENT_ONLY), true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) ! ifneq ($(OBJCOPY),) EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo endif endif endif EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) ! ifneq ($(OBJCOPY),) EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo endif EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar --- 165,227 ---- ifneq ($(BUILD_CLIENT_ONLY),true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) ! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ! ifeq ($(ZIP_DEBUGINFO_FILES),1) ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.diz ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.diz ! else EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo endif + endif endif ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) ! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ! ifeq ($(ZIP_DEBUGINFO_FILES),1) ! EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz ! EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.diz ! EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.diz ! EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.diz ! EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.diz ! else EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo endif + endif ifneq ($(BUILD_CLIENT_ONLY), true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) ! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ! ifeq ($(ZIP_DEBUGINFO_FILES),1) ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.diz ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.diz ! else EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo endif endif + endif endif EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) ! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ! ifeq ($(ZIP_DEBUGINFO_FILES),1) ! EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz ! else EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo + endif endif EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar