e0121aeccf
Remove patches included upstream - JDK-8031668/PR2842 - JDK-8148351/PR2842 - JDK-6260348/PR3066 - JDK-8061305/PR3335/RH1423421 - JDK-8188030/PR3459/RH1484079 - JDK-8205104/PR3539/RH1548475 - JDK-8185723/PR3553 - JDK-8186461/PR3557 - JDK-8201509/PR3579 - JDK-8075942/PR3602 - JDK-8203182/PR3603 - JDK-8206406/PR3610/RH1597825 - JDK-8206425 - JDK-8036003 - JDK-8201495/PR2415 - JDK-8150954/PR2866/RH1176206 Re-generate patches (mostly due to upstream build changes) - JDK-8073139/PR1758/RH1191652 - JDK-8143245/PR3548 (due to JDK-8202600) - JDK-8197429/PR3546/RH1536622 (due to JDK-8189170) - JDK-8199936/PR3533 - JDK-8199936/PR3591 - JDK-8207057/PR3613 - JDK-8210761/RH1632174 (due to JDK-8207402) - PR3559 (due to JDK-8185723/JDK-8186461/JDK-8201509) - PR3593 (due to JDK-8081202) - RH1566890/CVE-2018-3639 (due to JDK-8189170) - RH1649664 (due to JDK-8196516)
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
|
|
--- openjdk.orig///common/autoconf/flags.m4
|
|
+++ openjdk///common/autoconf/flags.m4
|
|
@@ -282,9 +282,11 @@
|
|
if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
|
|
CFLAGS_DEBUG_SYMBOLS="-g1"
|
|
CXXFLAGS_DEBUG_SYMBOLS="-g1"
|
|
+ ASFLAGS_DEBUG_SYMBOLS="-g1"
|
|
else
|
|
CFLAGS_DEBUG_SYMBOLS="-g"
|
|
CXXFLAGS_DEBUG_SYMBOLS="-g"
|
|
+ ASFLAGS_DEBUG_SYMBOLS="-g"
|
|
fi
|
|
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
|
|
CFLAGS_DEBUG_SYMBOLS="-g -xs"
|
|
@@ -295,6 +297,7 @@
|
|
fi
|
|
AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
|
|
AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
|
|
+ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
|
|
|
|
# Optimization levels
|
|
if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
|
|
diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in
|
|
--- openjdk.orig///common/autoconf/spec.gmk.in
|
|
+++ openjdk///common/autoconf/spec.gmk.in
|
|
@@ -414,6 +414,7 @@
|
|
# Options for generating debug symbols
|
|
ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
|
|
CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
|
|
+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
|
|
CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
|
|
ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
|
|
STRIP_POLICY:=@STRIP_POLICY@
|
|
diff --git openjdk.orig///make/common/NativeCompilation.gmk openjdk///make/common/NativeCompilation.gmk
|
|
--- openjdk.orig///make/common/NativeCompilation.gmk
|
|
+++ openjdk///make/common/NativeCompilation.gmk
|
|
@@ -351,12 +351,14 @@
|
|
# Always add debug symbols
|
|
$1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
|
|
$1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
|
|
+ $1_EXTRA_ASFLAGS+=$(ASFLAGS_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)
|
|
+ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
|
|
endif
|
|
endif
|
|
endif
|