# HG changeset patch
# User aph
# Date 1239980180 -3600
# Node ID c84bf0caab7fbf68887dd7365b5895c1e96eefd5
# Parent  a8134c4ee2cf451cf9b5e1609f39d83ecd53acc5
6829575: 100028: Debug information is incomplete or missing
Summary: Enable debugging in many places
Reviewed-by: ohair
Contributed-by: Andrew Haley <aph@redhat.com>

diff -r a8134c4ee2cf -r c84bf0caab7f jdk/make/common/Defs-linux.gmk
--- a/jdk/make/common/Defs-linux.gmk	Wed Jul 05 16:51:35 2017 +0200
+++ b/jdk/make/common/Defs-linux.gmk	Fri Apr 17 15:56:20 2009 +0100
@@ -165,6 +165,12 @@
   endif
 endif
 
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+  DEBUG_FLAG = -g
+  CFLAGS_REQUIRED += $(DEBUG_FLAG)
+endif
+
 CFLAGS_OPT      = $(CC_OPT)
 CFLAGS_DBG      = $(DEBUG_FLAG)
 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
@@ -240,8 +246,11 @@
 #
 ifeq ($(VARIANT), OPT)
   ifneq ($(NO_STRIP), true)
-    # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
-    POST_STRIP_PROCESS = $(STRIP) -g
+    ifneq ($(DEBUG_BINARIES), true)
+      # Debug 'strip -g' leaves local function Elf symbols (better stack
+      # traces)
+      POST_STRIP_PROCESS = $(STRIP) -g
+    endif
   endif
 endif
 
diff -r a8134c4ee2cf -r c84bf0caab7f jdk/make/sun/awt/mawt.gmk
--- a/jdk/make/sun/awt/mawt.gmk	Wed Jul 05 16:51:35 2017 +0200
+++ b/jdk/make/sun/awt/mawt.gmk	Fri Apr 17 15:56:20 2009 +0100
@@ -108,7 +108,9 @@
 #
 
 
-#CFLAGS += -g
+ifeq ($(DEBUG_BINARIES), true)
+  CFLAGS += -g
+endif
 ifeq ($(HEADLESS),true)
 CFLAGS += -DHEADLESS=$(HEADLESS)
 CPPFLAGS += -DHEADLESS=$(HEADLESS)