/hg/icedtea: PR1368: Enable debugging information in JDK programs.

[andrew at icedtea.classpath.org]

changeset 53f6588f92fb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=53f6588f92fb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Apr 02 22:15:37 2013 +0100

	PR1368: Enable debugging information in JDK programs.

	2013-04-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patch.
		* patches/pr1368-debug_jdk_programs.patch:
		Enable debugging for all programs as well
		as libraries.


diffstat:

 ChangeLog                               |   8 ++++++
 Makefile.am                             |   3 +-
 patches/pr1368-debug_jdk_programs.patch |  43 +++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletions(-)

diffs (75 lines):

diff -r 802dc6e27667 -r 53f6588f92fb ChangeLog
--- a/ChangeLog	Thu Mar 28 21:55:11 2013 +0000
+++ b/ChangeLog	Tue Apr 02 22:15:37 2013 +0100
@@ -1,3 +1,11 @@
+2013-04-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* patches/pr1368-debug_jdk_programs.patch:
+	Enable debugging for all programs as well
+	as libraries.
+
 2013-03-28  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* acinclude.m4:
diff -r 802dc6e27667 -r 53f6588f92fb Makefile.am
--- a/Makefile.am	Thu Mar 28 21:55:11 2013 +0000
+++ b/Makefile.am	Tue Apr 02 22:15:37 2013 +0100
@@ -216,7 +216,8 @@
 	patches/alt-jar.patch \
 	patches/cacao/arch.patch \
 	patches/disable-intree-ec.patch \
-	patches/pr1368-debug_jdk_libs.patch
+	patches/pr1368-debug_jdk_libs.patch \
+	patches/pr1368-debug_jdk_programs.patch
 
 # Conditional patches
 
diff -r 802dc6e27667 -r 53f6588f92fb patches/pr1368-debug_jdk_programs.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr1368-debug_jdk_programs.patch	Tue Apr 02 22:15:37 2013 +0100
@@ -0,0 +1,43 @@
+diff --git a/common/makefiles/NativeCompilation.gmk b/common/makefiles/NativeCompilation.gmk
+--- openjdk/common/makefiles/NativeCompilation.gmk
++++ openjdk/common/makefiles/NativeCompilation.gmk
+@@ -303,11 +303,17 @@
+ 
+     ifneq (,$$($1_DEBUG_SYMBOLS))	
+         ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+-            # Programs don't get the debug symbols added in the old build. It's not clear if
+-            # this is intentional.
+-            ifeq ($$($1_PROGRAM),)
++	    ifdef OPENJDK
++	        # Always add debug symbols
+                 $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+                 $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++	    else
++                # Programs don't get the debug symbols added in the old build. It's not clear if
++                # this is intentional.
++                ifeq ($$($1_PROGRAM),)
++                    $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
++                    $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++                endif
+             endif
+         endif
+     endif
+diff --git a/makefiles/CompileLaunchers.gmk b/makefiles/CompileLaunchers.gmk
+--- openjdk/jdk/makefiles/CompileLaunchers.gmk
++++ openjdk/jdk/makefiles/CompileLaunchers.gmk
+@@ -472,6 +472,7 @@
+ 			  -D "JDK_FNAME=unpack200.exe" \
+ 			  -D "JDK_INTERNAL_NAME=unpack200" \
+ 			  -D "JDK_FTYPE=0x1L",\
++	        DEBUG_SYMBOLS:=true,\
+ 		MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
+ 
+ ifeq ($(OPENJDK_TARGET_OS),windows)
+@@ -556,6 +557,7 @@
+ 			 $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
+ 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
+ 		OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
++		DEBUG_SYMBOLS:=true,\
+ 		PROGRAM:=jexec))
+ 
+ 	BUILD_LAUNCHERS += $(BUILD_JEXEC)