stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Joseph Provino 2015-12-17 18:22:30 +00:00
commit b24135a16b
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/autoconf/generated-configure.sh
View File

@ -4728,7 +4728,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1449859210 DATE_WHEN_GENERATED=1450343758
############################################################################### ###############################################################################
# #
@ -47677,7 +47677,10 @@ $as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
ENABLE_DEBUG_SYMBOLS=true ENABLE_DEBUG_SYMBOLS=true
ZIP_DEBUGINFO_FILES=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 STRIP_POLICY=min_strip
elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
ENABLE_DEBUG_SYMBOLS=false ENABLE_DEBUG_SYMBOLS=false
@ -47687,6 +47690,8 @@ $as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
ENABLE_DEBUG_SYMBOLS=false # -g option only ENABLE_DEBUG_SYMBOLS=false # -g option only
ZIP_DEBUGINFO_FILES=false ZIP_DEBUGINFO_FILES=false
# Fastdebug builds with this setting will essentially be slowdebug
# in hotspot.
DEBUG_BINARIES=true DEBUG_BINARIES=true
STRIP_POLICY=no_strip STRIP_POLICY=no_strip
STRIP="" STRIP=""
@ -47702,7 +47707,10 @@ $as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
ENABLE_DEBUG_SYMBOLS=true ENABLE_DEBUG_SYMBOLS=true
ZIP_DEBUGINFO_FILES=false 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 STRIP_POLICY=min_strip
else else
as_fn_error $? "Allowed native debug symbols are: none, internal, external, zipped" "$LINENO" 5 as_fn_error $? "Allowed native debug symbols are: none, internal, external, zipped" "$LINENO" 5

12
common/autoconf/jdk-options.m4
View File

@ -515,7 +515,10 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
ENABLE_DEBUG_SYMBOLS=true ENABLE_DEBUG_SYMBOLS=true
ZIP_DEBUGINFO_FILES=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 STRIP_POLICY=min_strip
elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
ENABLE_DEBUG_SYMBOLS=false ENABLE_DEBUG_SYMBOLS=false
@ -525,6 +528,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
ENABLE_DEBUG_SYMBOLS=false # -g option only ENABLE_DEBUG_SYMBOLS=false # -g option only
ZIP_DEBUGINFO_FILES=false ZIP_DEBUGINFO_FILES=false
# Fastdebug builds with this setting will essentially be slowdebug
# in hotspot.
DEBUG_BINARIES=true DEBUG_BINARIES=true
STRIP_POLICY=no_strip STRIP_POLICY=no_strip
STRIP="" STRIP=""
@ -540,7 +545,10 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
ENABLE_DEBUG_SYMBOLS=true ENABLE_DEBUG_SYMBOLS=true
ZIP_DEBUGINFO_FILES=false 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 STRIP_POLICY=min_strip
else else
AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped]) AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])