changeset in /hg/icedtea: 2007-10-05 Andrew Haley <aph at redhat....

[Andrew Haley]

changeset bfc6f7f31e6d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bfc6f7f31e6d
description:
	2007-10-05  Andrew Haley  <aph at redhat.com>

	        * patches/icedtea-debuginfo.patch: Add
	        openjdk/hotspot/build/linux/makefiles/gcc.make.
	        Add -g to CFLAGS_REQUIRED in
	        openjdk/j2se/make/common/Defs-linux.gmk

diffstat:

2 files changed, 29 insertions(+), 5 deletions(-)
ChangeLog                       |    7 +++++++
patches/icedtea-debuginfo.patch |   27 ++++++++++++++++++++++-----

diffs (69 lines):

diff -r 0d5ebdf62450 -r bfc6f7f31e6d ChangeLog
--- a/ChangeLog	Thu Oct 04 16:43:18 2007 -0400
+++ b/ChangeLog	Fri Oct 05 12:45:23 2007 +0100
@@ -1,3 +1,10 @@ 2007-10-04  Thomas Fitzsimmons  <fitzsim
+2007-10-05  Andrew Haley  <aph at redhat.com>
+
+	* patches/icedtea-debuginfo.patch: Add
+	openjdk/hotspot/build/linux/makefiles/gcc.make.
+	Add -g to CFLAGS_REQUIRED in
+	openjdk/j2se/make/common/Defs-linux.gmk	
+
 2007-10-04  Thomas Fitzsimmons  <fitzsim at redhat.com>
 
 	PR 73
diff -r 0d5ebdf62450 -r bfc6f7f31e6d patches/icedtea-debuginfo.patch
--- a/patches/icedtea-debuginfo.patch	Thu Oct 04 16:43:18 2007 -0400
+++ b/patches/icedtea-debuginfo.patch	Fri Oct 05 12:45:23 2007 +0100
@@ -1,6 +1,6 @@
---- openjdk/j2se/make/common/Defs-linux.gmk~	2007-05-24 08:33:20.000000000 +0100
-+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-06-21 15:32:44.000000000 +0100
-@@ -155,13 +155,7 @@
+--- openjdk/j2se/make/common/Defs-linux.gmk.orig	2007-09-27 08:52:06.000000000 +0100
++++ openjdk/j2se/make/common/Defs-linux.gmk	2007-10-04 15:04:02.000000000 +0100
+@@ -155,13 +155,11 @@
     CFLAGS_COMMON   += $(GLOBAL_KPIC) $(GCC_WARNINGS)
  endif
  
@@ -11,10 +11,14 @@
 -    DEBUG_FLAG = -g1
 -  endif
 -endif
++
++# Always generate full debuginfo on Linux.  It'll be in a separate
++# debuginfo package when building RPMs.
++CFLAGS_REQUIRED += -g
  
  CFLAGS_OPT      = $(POPT)
  CFLAGS_DBG      = $(DEBUG_FLAG)
-@@ -230,7 +230,7 @@
+@@ -236,7 +234,7 @@
  ifeq ($(VARIANT), OPT)
    ifneq ($(NO_STRIP), true)
      # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
@@ -34,7 +38,7 @@
  ifeq ($(HEADLESS),true)
  CFLAGS += -DHEADLESS=$(HEADLESS)
  CPPFLAGS += -DHEADLESS=$(HEADLESS)
---- ../openjdk-b20/openjdk/j2se/make/common/shared/Defs-java.gmk	2007-09-13 03:52:42.000000000 -0400
+--- openjdk/j2se/make/common/shared/Defs-java.gmk	2007-09-13 03:52:42.000000000 -0400
 +++ openjdk/j2se/make/common/shared/Defs-java.gmk	2007-09-14 10:50:45.000000000 -0400
 @@ -98,15 +98,9 @@
  #  -- Use JAVAC_CMD if you want to take the defaults given to you.
@@ -55,3 +59,16 @@
  ifeq ($(COMPILER_WARNINGS_FATAL), true)
    JAVACFLAGS  += -Werror
  endif
+--- openjdk/hotspot/build/linux/makefiles/gcc.make~	2007-10-03 17:54:11.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-03 18:19:33.000000000 +0100
+@@ -63,6 +63,10 @@
+ CFLAGS += -D_REENTRANT
+ CFLAGS += -fcheck-new
+ 
++# Always generate full debuginfo on Linux.  It'll be in a separate
++# debuginfo package when building RPMs.
++CFLAGS += -g
++
+ ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
+ ARCHFLAG/i486    = -m32 -march=i586
+ ARCHFLAG/amd64   = -m64