--- a/build/linux/makefiles/gcc.make Fri May 08 18:12:15 2009 -0700
+++ b/build/linux/makefiles/gcc.make Thu May 28 17:52:03 2009 +0100
@@ -170,3 +170,9 @@ ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
DEBUG_CFLAGS += -gstabs
endif
+
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ DEBUG_CFLAGS = -g
+ CFLAGS += $(DEBUG_CFLAGS)
+endif
--- a/build/linux/makefiles/jsig.make Fri May 08 18:12:15 2009 -0700
+++ b/build/linux/makefiles/jsig.make Thu May 28 17:52:03 2009 +0100
@@ -41,10 +41,15 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ JSIG_DEBUG_CFLAGS = -g
+endif
+
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
@echo Making signal interposition lib...
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
- $(LFLAGS_JSIG) -o $@ $< -ldl
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
--- a/build/linux/makefiles/saproc.make Fri May 08 18:12:15 2009 -0700
+++ b/build/linux/makefiles/saproc.make Thu May 28 17:52:03 2009 +0100
@@ -43,6 +43,11 @@ SAMAPFILE = $(SASRCDIR)/mapfile
DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ SA_DEBUG_CFLAGS = -g
+endif
+
# if $(AGENT_DIR) does not exist, we don't build SA
# also, we don't build SA on Itanium.
@@ -67,6 +72,7 @@ SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFI
-I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
$(SASRCFILES) \
$(SA_LFLAGS) \
+ $(SA_DEBUG_CFLAGS) \
-o $@ \
-lthread_db