OpenJDK / portola / portola
changeset 35010:d0e2516cc2a2
8145564: 8036003: startup regression on linux fastdebug builds
Reviewed-by: ihse
| author | erikj |
|---|---|
| date | Thu, 17 Dec 2015 10:16:27 +0100 |
| parents | 5a74c7d52dde |
| children | fb6550b19018 |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 |
| diffstat | 2 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Fri Dec 11 17:45:48 2015 -0800 +++ b/common/autoconf/generated-configure.sh Thu Dec 17 10:16:27 2015 +0100 @@ -4728,7 +4728,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1449850507 +DATE_WHEN_GENERATED=1450343758 ############################################################################### # @@ -47677,7 +47677,10 @@ ENABLE_DEBUG_SYMBOLS=true ZIP_DEBUGINFO_FILES=true - DEBUG_BINARIES=true + # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles + # will basically do slowdebug builds when DEBUG_BINARIES is set for + # fastdebug builds + DEBUG_BINARIES=false STRIP_POLICY=min_strip elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then ENABLE_DEBUG_SYMBOLS=false @@ -47687,6 +47690,8 @@ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then ENABLE_DEBUG_SYMBOLS=false # -g option only ZIP_DEBUGINFO_FILES=false + # Fastdebug builds with this setting will essentially be slowdebug + # in hotspot. DEBUG_BINARIES=true STRIP_POLICY=no_strip STRIP="" @@ -47702,7 +47707,10 @@ ENABLE_DEBUG_SYMBOLS=true ZIP_DEBUGINFO_FILES=false - DEBUG_BINARIES=true + # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles + # will basically do slowdebug builds when DEBUG_BINARIES is set for + # fastdebug builds + DEBUG_BINARIES=false STRIP_POLICY=min_strip else as_fn_error $? "Allowed native debug symbols are: none, internal, external, zipped" "$LINENO" 5
--- a/common/autoconf/jdk-options.m4 Fri Dec 11 17:45:48 2015 -0800 +++ b/common/autoconf/jdk-options.m4 Thu Dec 17 10:16:27 2015 +0100 @@ -515,7 +515,10 @@ ENABLE_DEBUG_SYMBOLS=true ZIP_DEBUGINFO_FILES=true - DEBUG_BINARIES=true + # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles + # will basically do slowdebug builds when DEBUG_BINARIES is set for + # fastdebug builds + DEBUG_BINARIES=false STRIP_POLICY=min_strip elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then ENABLE_DEBUG_SYMBOLS=false @@ -525,6 +528,8 @@ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then ENABLE_DEBUG_SYMBOLS=false # -g option only ZIP_DEBUGINFO_FILES=false + # Fastdebug builds with this setting will essentially be slowdebug + # in hotspot. DEBUG_BINARIES=true STRIP_POLICY=no_strip STRIP="" @@ -540,7 +545,10 @@ ENABLE_DEBUG_SYMBOLS=true ZIP_DEBUGINFO_FILES=false - DEBUG_BINARIES=true + # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles + # will basically do slowdebug builds when DEBUG_BINARIES is set for + # fastdebug builds + DEBUG_BINARIES=false STRIP_POLICY=min_strip else AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])