|
 |
1a0dbd |
diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
|
|
|
1a0dbd |
--- openjdk.orig///common/autoconf/flags.m4
|
|
|
1a0dbd |
+++ openjdk///common/autoconf/flags.m4
|
|
|
1a0dbd |
@@ -282,9 +282,11 @@
|
|
|
1a0dbd |
if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
|
|
|
1a0dbd |
CFLAGS_DEBUG_SYMBOLS="-g1"
|
|
|
1a0dbd |
CXXFLAGS_DEBUG_SYMBOLS="-g1"
|
|
|
1a0dbd |
+ ASFLAGS_DEBUG_SYMBOLS="-g1"
|
|
|
1a0dbd |
else
|
|
|
1a0dbd |
CFLAGS_DEBUG_SYMBOLS="-g"
|
|
|
1a0dbd |
CXXFLAGS_DEBUG_SYMBOLS="-g"
|
|
|
1a0dbd |
+ ASFLAGS_DEBUG_SYMBOLS="-g"
|
|
|
1a0dbd |
fi
|
|
|
1a0dbd |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
|
|
|
1a0dbd |
CFLAGS_DEBUG_SYMBOLS="-g -xs"
|
|
|
1a0dbd |
@@ -295,6 +297,7 @@
|
|
|
1a0dbd |
fi
|
|
|
1a0dbd |
AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
+ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
|
|
|
1a0dbd |
# Optimization levels
|
|
|
1a0dbd |
if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
|
|
|
1a0dbd |
diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
|
|
|
1a0dbd |
--- openjdk.orig///common/autoconf/spec.gmk.in
|
|
|
1a0dbd |
+++ openjdk///common/autoconf/spec.gmk.in
|
|
|
1a0dbd |
@@ -414,6 +414,7 @@
|
|
|
1a0dbd |
# Options for generating debug symbols
|
|
|
1a0dbd |
ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
|
|
|
1a0dbd |
CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
|
|
|
1a0dbd |
+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
|
|
|
1a0dbd |
CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
|
|
|
1a0dbd |
ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
|
|
|
1a0dbd |
STRIP_POLICY:=@STRIP_POLICY@
|
|
|
1a0dbd |
diff --git openjdk.orig///make/common/NativeCompilation.gmk openjdk///make/common/NativeCompilation.gmk
|
|
|
1a0dbd |
--- openjdk.orig///make/common/NativeCompilation.gmk
|
|
|
1a0dbd |
+++ openjdk///make/common/NativeCompilation.gmk
|
|
|
1a0dbd |
@@ -351,12 +351,14 @@
|
|
|
1a0dbd |
# Always add debug symbols
|
|
|
1a0dbd |
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
+ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
else
|
|
|
1a0dbd |
# Programs don't get the debug symbols added in the old build. It's not clear if
|
|
|
1a0dbd |
# this is intentional.
|
|
|
1a0dbd |
ifeq ($$($1_PROGRAM),)
|
|
|
1a0dbd |
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
+ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
|
|
|
1a0dbd |
endif
|
|
|
1a0dbd |
endif
|
|
|
1a0dbd |
endif
|