# HG changeset patch
# User ihse
# Date 1453280053 -3600
# Node ID 50b3cdcef339d85173774d586114e8377dc13079
# Parent 4dbd51482fb8f8750afeef7783c0750e3ab20b38
8145596: Enable debug symbols for all libraries
Reviewed-by: erikj
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/launcher/Launcher-java.base.gmk
--- a/jdk/make/launcher/Launcher-java.base.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/launcher/Launcher-java.base.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -130,7 +130,6 @@
LDFLAGS := $(LDFLAGS_JDKEXE), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
- DEBUG_SYMBOLS := true, \
PROGRAM := jexec))
TARGETS += $(BUILD_JEXEC)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/launcher/Launcher-jdk.accessibility.gmk
--- a/jdk/make/launcher/Launcher-jdk.accessibility.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/launcher/Launcher-jdk.accessibility.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -45,7 +45,6 @@
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jabswitch, \
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
PROGRAM := jabswitch, \
- DEBUG_SYMBOLS := true, \
VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=jabswitch.exe" \
@@ -79,7 +78,6 @@
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccessinspector$1, \
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
PROGRAM := jaccessinspector$1, \
- DEBUG_SYMBOLS := true, \
VERSIONINFO_RESOURCE := $(TOPDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
RC_FLAGS := $$(RC_FLAGS) \
-D "JDK_FNAME=jaccessinspector$1.exe" \
@@ -107,7 +105,6 @@
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccesswalker$1, \
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
PROGRAM := jaccesswalker$1, \
- DEBUG_SYMBOLS := true, \
VERSIONINFO_RESOURCE := $(TOPDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
RC_FLAGS := $$(RC_FLAGS) \
-D "JDK_FNAME=jaccesswalker$1.exe" \
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/launcher/Launcher-jdk.pack200.gmk
--- a/jdk/make/launcher/Launcher-jdk.pack200.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -100,7 +100,6 @@
-D "JDK_FNAME=unpack200.exe" \
-D "JDK_INTERNAL_NAME=unpack200" \
-D "JDK_FTYPE=0x1L", \
- DEBUG_SYMBOLS := true, \
MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest, \
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
))
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/launcher/LauncherCommon.gmk
--- a/jdk/make/launcher/LauncherCommon.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/launcher/LauncherCommon.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -25,12 +25,6 @@
include NativeCompilation.gmk
-# SetupNativeCompilation now supports debug symbols on macosx for hotspot.
-# Disable it here for the jdk binaries until we decide to enable them.
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- ENABLE_DEBUG_SYMBOLS := false
-endif
-
ifeq ($(OPENJDK_TARGET_OS), macosx)
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
else
@@ -200,7 +194,6 @@
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$1_objs, \
OUTPUT_DIR := $$($1_OUTPUT_DIR), \
PROGRAM := $1, \
- DEBUG_SYMBOLS := true, \
VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
RC_FLAGS := $$(RC_FLAGS) \
-D "JDK_FNAME=$1$(EXE_SUFFIX)" \
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Awt2dLibraries.gmk
--- a/jdk/make/lib/Awt2dLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Awt2dLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -69,7 +69,7 @@
-D "JDK_INTERNAL_NAME=mlib_image" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
@@ -134,7 +134,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
@@ -279,7 +279,7 @@
-D "JDK_INTERNAL_NAME=awt" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBAWT): $(call FindLib, java.base, java)
@@ -369,7 +369,7 @@
-D "JDK_INTERNAL_NAME=xawt" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_xawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
@@ -433,7 +433,7 @@
-D "JDK_INTERNAL_NAME=lcms" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/liblcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
TARGETS += $(BUILD_LIBLCMS)
@@ -509,7 +509,7 @@
-D "JDK_FTYPE=0x2L", \
REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
@@ -578,7 +578,7 @@
LIBS_linux := -lm $(LIBDL), \
LIBS_solaris := -lm $(LIBDL) $(LIBCXX) -lc, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
@@ -700,7 +700,7 @@
-D "JDK_INTERNAL_NAME=fontmanager" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
@@ -745,7 +745,7 @@
-D "JDK_INTERNAL_NAME=jawt" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBJAWT): $(BUILD_LIBAWT)
@@ -805,7 +805,7 @@
LIBS_solaris := $(X_LIBS) -lXrender, \
LIBS_macosx := -framework Cocoa, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
ifndef BUILD_HEADLESS_ONLY
$(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
@@ -927,7 +927,7 @@
-D "JDK_INTERNAL_NAME=splashscreen" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBSPLASHSCREEN)
@@ -1003,7 +1003,7 @@
-framework OpenGL \
-framework QuartzCore -ljava, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_lwawt, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBAWT_LWAWT)
@@ -1045,7 +1045,7 @@
-framework JavaRuntimeSupport \
-ljava -ljvm, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBOSXUI)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/CoreLibraries.gmk
--- a/jdk/make/lib/CoreLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/CoreLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -55,7 +55,7 @@
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
ARFLAGS := $(ARFLAGS), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
else
@@ -68,7 +68,7 @@
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
LDFLAGS := -nostdlib -r -arch x86_64, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
$(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
@@ -86,7 +86,7 @@
LIBVERIFY_OPTIMIZATION := HIGH
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
LIBVERIFY_OPTIMIZATION := LOW
endif
endif
@@ -110,7 +110,7 @@
-D "JDK_FTYPE=0x2L", \
REORDER := $(BUILD_LIBVERIFY_REORDER), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify, \
- DEBUG_SYMBOLS := true))
+))
TARGETS += $(BUILD_LIBVERIFY)
@@ -178,7 +178,7 @@
-D "JDK_FTYPE=0x2L", \
REORDER := $(LIBJAVA_REORDER), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
TARGETS += $(BUILD_LIBJAVA)
@@ -235,8 +235,7 @@
-D "JDK_INTERNAL_NAME=zip" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libzip, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
+))
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
@@ -280,7 +279,7 @@
-D "JDK_INTERNAL_NAME=jimage" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA)
@@ -396,7 +395,7 @@
-D "JDK_INTERNAL_NAME=jli" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
TARGETS += $(BUILD_LIBJLI)
@@ -414,7 +413,7 @@
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
ARFLAGS := $(ARFLAGS), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBJLI_STATIC)
@@ -433,7 +432,7 @@
CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
LDFLAGS := -nostdlib -r, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
ifeq ($(STATIC_BUILD), true)
TARGETS += $(BUILD_LIBJLI_STATIC)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-java.instrument.gmk
--- a/jdk/make/lib/Lib-java.instrument.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-java.instrument.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -84,7 +84,7 @@
-D "JDK_INTERNAL_NAME=instrument" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libinstrument, \
- DEBUG_SYMBOLS := true))
+))
ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix))
$(BUILD_LIBINSTRUMENT): $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-java.management.gmk
--- a/jdk/make/lib/Lib-java.management.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-java.management.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -40,7 +40,7 @@
LIBMANAGEMENT_OPTIMIZATION := HIGH
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
LIBMANAGEMENT_OPTIMIZATION := LOW
endif
endif
@@ -64,7 +64,7 @@
-D "JDK_INTERNAL_NAME=management" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement, \
- DEBUG_SYMBOLS := true))
+))
$(BUILD_LIBMANAGEMENT): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-java.prefs.gmk
--- a/jdk/make/lib/Lib-java.prefs.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-java.prefs.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -55,7 +55,7 @@
-D "JDK_INTERNAL_NAME=prefs" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libprefs, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBPREFS): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-java.security.jgss.gmk
--- a/jdk/make/lib/Lib-java.security.jgss.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-java.security.jgss.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -46,7 +46,7 @@
LIBS := $(LIBDL), \
LIBS_solaris := -lc, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2gss, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBJ2GSS)
endif
@@ -92,7 +92,7 @@
-D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libkrb5, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBKRB5)
endif
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-java.smartcardio.gmk
--- a/jdk/make/lib/Lib-java.smartcardio.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-java.smartcardio.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -52,7 +52,7 @@
-D "JDK_INTERNAL_NAME=j2pcsc" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2pcsc, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
TARGETS += $(BUILD_LIBJ2PCSC)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.accessibility.gmk
--- a/jdk/make/lib/Lib-jdk.accessibility.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.accessibility.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -61,7 +61,7 @@
-D "JDK_INTERNAL_NAME=javaaccessbridge$1" \
-D "JDK_FTYPE=0x02L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavaaccessbridge$1, \
- DEBUG_SYMBOLS := true)
+ )
$$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib
@@ -91,7 +91,7 @@
-D "JDK_INTERNAL_NAME=windowsaccessbridge$1" \
-D "JDK_FTYPE=0x02L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libwindowsaccessbridge$1, \
- DEBUG_SYMBOLS := true)
+ )
TARGETS += $$(BUILD_WINDOWSACCESSBRIDGE$1)
@@ -113,7 +113,7 @@
-D "JDK_INTERNAL_NAME=jabsysinfo" \
-D "JDK_FTYPE=0x02L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/lib/libjabsysinfo, \
- DEBUG_SYMBOLS := true)
+ )
TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.attach.gmk
--- a/jdk/make/lib/Lib-jdk.attach.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.attach.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -56,7 +56,7 @@
LIBS_solaris := -ldoor, \
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libattach, \
- DEBUG_SYMBOLS := true))
+))
$(BUILD_LIBATTACH): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.crypto.ec.gmk
--- a/jdk/make/lib/Lib-jdk.crypto.ec.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.crypto.ec.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -68,7 +68,7 @@
-D "JDK_INTERNAL_NAME=sunec" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsunec, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBSUNEC)
endif
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.crypto.mscapi.gmk
--- a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -47,7 +47,7 @@
-D "JDK_INTERNAL_NAME=sunmscapi" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsunmscapi, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBSUNMSCAPI)
endif
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk
--- a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -51,7 +51,7 @@
-D "JDK_INTERNAL_NAME=j2pkcs11" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2pkcs11, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
TARGETS += $(BUILD_LIBJ2PKCS11)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk
--- a/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.crypto.ucrypto.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -44,7 +44,7 @@
LIBS := $(LIBDL), \
LIBS_solaris := -lc, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libj2ucrypto, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.deploy.osx.gmk
--- a/jdk/make/lib/Lib-jdk.deploy.osx.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.deploy.osx.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -57,7 +57,7 @@
-framework SystemConfiguration \
$(JDKLIB_LIBS), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosx, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBOSX)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.internal.le.gmk
--- a/jdk/make/lib/Lib-jdk.internal.le.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.internal.le.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -51,7 +51,7 @@
-D "JDK_INTERNAL_NAME=le" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/lible, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBLE)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.jdi.gmk
--- a/jdk/make/lib/Lib-jdk.jdi.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.jdi.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -55,7 +55,7 @@
-D "JDK_INTERNAL_NAME=dt_shmem" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libdt_shmem, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBDT_SHMEM)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.jdwp.agent.gmk
--- a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -56,7 +56,7 @@
-D "JDK_INTERNAL_NAME=dt_socket" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libdt_socket, \
- DEBUG_SYMBOLS := true))
+))
$(BUILD_LIBDT_SOCKET): $(call FindLib, java.base, java)
@@ -95,7 +95,7 @@
-D "JDK_INTERNAL_NAME=jdwp" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjdwp, \
- DEBUG_SYMBOLS := true))
+))
$(BUILD_LIBJDWP): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.management.gmk
--- a/jdk/make/lib/Lib-jdk.management.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.management.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -48,7 +48,7 @@
LIBMANAGEMENT_EXT_OPTIMIZATION := HIGH
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
- ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+ ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
LIBMANAGEMENT_EXT_OPTIMIZATION := LOW
endif
endif
@@ -73,7 +73,7 @@
-D "JDK_INTERNAL_NAME=management_ext" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement_ext, \
- DEBUG_SYMBOLS := true))
+))
$(BUILD_LIBMANAGEMENT_EXT): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.pack200.gmk
--- a/jdk/make/lib/Lib-jdk.pack200.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.pack200.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -52,7 +52,7 @@
-D "JDK_FNAME=unpack.dll" \
-D "JDK_INTERNAL_NAME=unpack" \
-D "JDK_FTYPE=0x2L", \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBUNPACK): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.sctp.gmk
--- a/jdk/make/lib/Lib-jdk.sctp.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.sctp.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -53,7 +53,7 @@
LIBS_linux := -lpthread $(LIBDL), \
LIBS_solaris := -lsocket -lc, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBSCTP)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/Lib-jdk.security.auth.gmk
--- a/jdk/make/lib/Lib-jdk.security.auth.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/Lib-jdk.security.auth.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -55,7 +55,7 @@
-D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjaas, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBJAAS): $(call FindLib, java.base, java)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/LibCommon.gmk
--- a/jdk/make/lib/LibCommon.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/LibCommon.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -36,25 +36,6 @@
# elegant solution to this.
WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
-ifdef OPENJDK
- # Build everything with debugging on OpenJDK
- DEBUG_ALL_BINARIES := true
-else
- # Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
- # not on other platforms.
- ifeq ($(OPENJDK_TARGET_OS), windows)
- DEBUG_ALL_BINARIES := true
- else
- DEBUG_ALL_BINARIES := false
- endif
-endif
-
-# SetupNativeCompilation now supports debug symbols on macosx for hotspot.
-# Disable it here for the jdk libraries until we decide to enable them.
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- ENABLE_DEBUG_SYMBOLS := false
-endif
-
################################################################################
# Find the default set of src dirs for a native library.
# Param 1 - module name
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/NetworkingLibraries.gmk
--- a/jdk/make/lib/NetworkingLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/NetworkingLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -52,7 +52,7 @@
-D "JDK_INTERNAL_NAME=net" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBNET): $(BUILD_LIBJAVA)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/NioLibraries.gmk
--- a/jdk/make/lib/NioLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/NioLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -91,7 +91,7 @@
-D "JDK_INTERNAL_NAME=nio" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnio, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
TARGETS += $(BUILD_LIBNIO)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/PlatformLibraries.gmk
--- a/jdk/make/lib/PlatformLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/PlatformLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -54,7 +54,7 @@
-framework IOSurface \
-framework QuartzCore, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxapp, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
TARGETS += $(BUILD_LIBOSXAPP)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/SecurityLibraries.gmk
--- a/jdk/make/lib/SecurityLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/SecurityLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -54,7 +54,7 @@
-framework Security \
$(JDKLIB_LIBS), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxsecurity, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBOSXSECURITY): $(BUILD_LIBJAVA)
diff -r 4dbd51482fb8 -r 50b3cdcef339 jdk/make/lib/SoundLibraries.gmk
--- a/jdk/make/lib/SoundLibraries.gmk Tue Jan 19 11:43:01 2016 -0800
+++ b/jdk/make/lib/SoundLibraries.gmk Wed Jan 20 09:54:13 2016 +0100
@@ -138,7 +138,7 @@
-D "JDK_INTERNAL_NAME=jsound" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsound, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+))
$(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
@@ -173,7 +173,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := $(ALSA_LIBS) -ljava -ljvm, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundalsa, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
@@ -204,7 +204,7 @@
-D "JDK_INTERNAL_NAME=jsoundds" \
-D "JDK_FTYPE=0x2L", \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjsoundds, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+ ))
$(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)