OpenJDK / valhalla / valhalla9
changeset 1893:418029ac33ca
Merge
| author | dholmes |
|---|---|
| date | Thu, 17 Dec 2015 19:54:48 -0500 |
| parents | 201b864e0f1f bbbb9caaf21f |
| children | b25a1f3183e9 |
| files | common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Wed Dec 16 01:16:49 2015 -0500 +++ b/common/autoconf/generated-configure.sh Thu Dec 17 19:54:48 2015 -0500 @@ -4728,7 +4728,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1450246539 +DATE_WHEN_GENERATED=1450400041 ############################################################################### # @@ -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 Wed Dec 16 01:16:49 2015 -0500 +++ b/common/autoconf/jdk-options.m4 Thu Dec 17 19:54:48 2015 -0500 @@ -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])