--- a/.hgignore Thu Dec 10 09:24:59 2015 -0800
+++ b/.hgignore Wed Jul 05 21:07:00 2017 +0200
@@ -4,6 +4,7 @@
^webrev
^.hgtip
^.bridge2
+^.jib/
.DS_Store
.metadata/
.recommenders/
--- a/.hgtags-top-repo Thu Dec 10 09:24:59 2015 -0800
+++ b/.hgtags-top-repo Wed Jul 05 21:07:00 2017 +0200
@@ -338,3 +338,4 @@
331fda57dfd323c61804ba0472776790de572937 jdk9-b93
349488425abcaf3ff62f580007860b4b56875d10 jdk9-b94
12a6fb4f070f8ca8fbca219ab9abf5da8908b317 jdk-9+95
+5582a79892596169ebddb3e2c2aa44939e4e3f40 jdk-9+96
--- a/common/autoconf/basics.m4 Thu Dec 10 09:24:59 2015 -0800
+++ b/common/autoconf/basics.m4 Wed Jul 05 21:07:00 2017 +0200
@@ -99,7 +99,13 @@
AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
fi
- $1="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ $1="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ $1="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
])
@@ -237,12 +243,18 @@
# Register a --enable argument but mark it as deprecated
# $1: The name of the with argument to deprecate, not including --enable-
# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
+# $3: Messages to user.
AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
[
AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
[Deprecated. Option is kept for backwards compatibility and is ignored])])
if test "x$enable_$2" != x; then
AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
+
+ if test "x$3" != x; then
+ AC_MSG_WARN([$3])
+ fi
+
fi
])
@@ -1072,6 +1084,26 @@
AC_SUBST(BASH_ARGS)
])
+################################################################################
+#
+# Default make target
+#
+AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
+[
+ AC_ARG_WITH(default-make-target, [AS_HELP_STRING([--with-default-make-target],
+ [set the default make target @<:@exploded-image@:>@])])
+ if test "x$with_default_make_target" = "x" \
+ || test "x$with_default_make_target" = "xyes"; then
+ DEFAULT_MAKE_TARGET="exploded-image"
+ elif test "x$with_default_make_target" = "xno"; then
+ AC_MSG_ERROR([--without-default-make-target is not a valid option])
+ else
+ DEFAULT_MAKE_TARGET="$with_default_make_target"
+ fi
+
+ AC_SUBST(DEFAULT_MAKE_TARGET)
+])
+
# Code to run after AC_OUTPUT
AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
[
--- a/common/autoconf/configure Thu Dec 10 09:24:59 2015 -0800
+++ b/common/autoconf/configure Wed Jul 05 21:07:00 2017 +0200
@@ -257,10 +257,14 @@
# Now transfer control to the script generated by autoconf. This is where the
# main work is done.
+RCDIR=`mktemp -dt jdk-build-configure.tmp.XXXXXX` || exit $?
+trap "rm -rf \"$RCDIR\"" EXIT
conf_logfile=./configure.log
-(exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile
+(exec 3>&1 ; ((. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) \
+ ; echo $? > "$RCDIR/rc" ) \
+ | tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile
-conf_result_code=$?
+conf_result_code=`cat "$RCDIR/rc"`
###
### Post-processing
###
--- a/common/autoconf/configure.ac Thu Dec 10 09:24:59 2015 -0800
+++ b/common/autoconf/configure.ac Wed Jul 05 21:07:00 2017 +0200
@@ -121,6 +121,9 @@
# After basic tools have been setup, we can check build os specific details.
PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
+# Misc basic settings
+BASIC_SETUP_DEFAULT_MAKE_TARGET
+
###############################################################################
#
# Determine OpenJDK variants, options and version numbers.
--- a/common/autoconf/generated-configure.sh Thu Dec 10 09:24:59 2015 -0800
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 21:07:00 2017 +0200
@@ -690,6 +690,9 @@
GCOV_ENABLED
ZIP_DEBUGINFO_FILES
ENABLE_DEBUG_SYMBOLS
+STRIP_POLICY
+DEBUG_BINARIES
+NATIVE_DEBUG_SYMBOLS
CFLAGS_WARNINGS_ARE_ERRORS
DISABLE_WARNING_PREFIX
HOTSPOT_SET_WARNINGS_AS_ERRORS
@@ -862,6 +865,7 @@
BUILD_HEADLESS
SUPPORT_HEADFUL
SUPPORT_HEADLESS
+DEFAULT_MAKE_TARGET
OS_VERSION_MICRO
OS_VERSION_MINOR
OS_VERSION_MAJOR
@@ -1067,6 +1071,7 @@
with_sdk_name
with_conf_name
with_output_sync
+with_default_make_target
enable_headful
enable_hotspot_test_in_build
with_cacerts_file
@@ -1105,6 +1110,7 @@
with_build_devkit
with_jtreg
enable_warnings_as_errors
+with_native_debug_symbols
enable_debug_symbols
enable_zip_debug_info
enable_native_coverage
@@ -1885,9 +1891,10 @@
--disable-warnings-as-errors
do not consider native warnings to be an error
[enabled]
- --disable-debug-symbols disable generation of debug symbols [enabled]
- --disable-zip-debug-info
- disable zipping of debug-info files [enabled]
+ --enable-debug-symbols Deprecated. Option is kept for backwards
+ compatibility and is ignored
+ --enable-zip-debug-info Deprecated. Option is kept for backwards
+ compatibility and is ignored
--enable-native-coverage
enable native compilation with code coverage
data[disabled]
@@ -1933,6 +1940,8 @@
from important configuration options]
--with-output-sync set make output sync type if supported by make.
[recurse]
+ --with-default-make-target
+ set the default make target [exploded-image]
--with-cacerts-file specify alternative cacerts file
--with-copyright-year Set copyright year value for build [current year]
--with-milestone Deprecated. Option is kept for backwards
@@ -1997,6 +2006,9 @@
dependent]
--with-build-devkit Devkit to use for the build platform toolchain
--with-jtreg Regression Test Harness [probed]
+ --with-native-debug-symbols
+ set the native debug symbol configuration (none,
+ internal, external, zipped) [zipped]
--with-stdc++lib=<static>,<dynamic>,<default>
force linking of the C++ runtime on Linux to either
static or dynamic, default is static with dynamic as
@@ -3477,6 +3489,7 @@
# Register a --enable argument but mark it as deprecated
# $1: The name of the with argument to deprecate, not including --enable-
# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
+# $3: Messages to user.
@@ -3563,6 +3576,12 @@
# Check for support for specific options in bash
+################################################################################
+#
+# Default make target
+#
+
+
# Code to run after AC_OUTPUT
@@ -4052,6 +4071,15 @@
#
+################################################################################
+#
+# Static build support. When enabled will generate static
+# libraries instead of shared libraries for all JDK libs.
+#
+
+
+
+
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4091,15 +4119,6 @@
-################################################################################
-#
-# Static build support. When enabled will generate static
-# libraries instead of shared libraries for all JDK libs.
-#
-
-
-
-
#
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4709,7 +4728,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1449049746
+DATE_WHEN_GENERATED=1449850507
###############################################################################
#
@@ -15326,7 +15345,13 @@
as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- CURDIR="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ CURDIR="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ CURDIR="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -15452,7 +15477,13 @@
as_fn_error $? "The path of TOPDIR, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- TOPDIR="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ TOPDIR="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ TOPDIR="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -16022,7 +16053,13 @@
as_fn_error $? "The path of with_devkit, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- with_devkit="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ with_devkit="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ with_devkit="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -16554,7 +16591,13 @@
as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ OUTPUT_ROOT="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -23051,6 +23094,26 @@
+# Misc basic settings
+
+
+# Check whether --with-default-make-target was given.
+if test "${with_default_make_target+set}" = set; then :
+ withval=$with_default_make_target;
+fi
+
+ if test "x$with_default_make_target" = "x" \
+ || test "x$with_default_make_target" = "xyes"; then
+ DEFAULT_MAKE_TARGET="exploded-image"
+ elif test "x$with_default_make_target" = "xno"; then
+ as_fn_error $? "--without-default-make-target is not a valid option" "$LINENO" 5
+ else
+ DEFAULT_MAKE_TARGET="$with_default_make_target"
+ fi
+
+
+
+
###############################################################################
#
# Determine OpenJDK variants, options and version numbers.
@@ -23792,7 +23855,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -23988,7 +24057,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -24172,7 +24247,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -24355,7 +24436,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -24538,7 +24625,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -24712,7 +24805,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -24861,7 +24960,13 @@
as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ JAVA_HOME_PROCESSED="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -25031,7 +25136,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -25356,7 +25467,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -25568,7 +25685,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -25745,7 +25868,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -25950,7 +26079,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -26127,7 +26262,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -26332,7 +26473,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -26509,7 +26656,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -26714,7 +26867,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -26891,7 +27050,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -27083,7 +27248,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -27258,7 +27429,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -27451,7 +27628,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -27626,7 +27809,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -27818,7 +28007,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -27993,7 +28188,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -28186,7 +28387,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -28361,7 +28568,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -28535,7 +28748,13 @@
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ BOOT_JDK="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -31014,7 +31233,13 @@
as_fn_error $? "The path of ipath, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- ipath="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ ipath="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ ipath="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -31164,7 +31389,13 @@
as_fn_error $? "The path of libpath, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- libpath="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ libpath="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ libpath="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -42918,7 +43149,13 @@
as_fn_error $? "The path of with_build_devkit, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- with_build_devkit="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ with_build_devkit="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ with_build_devkit="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -45433,7 +45670,13 @@
as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- JT_HOME="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ JT_HOME="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ JT_HOME="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -47405,63 +47648,108 @@
# Setup debug symbols (need objcopy from the toolchain for that)
#
- # ENABLE_DEBUG_SYMBOLS
+ # NATIVE_DEBUG_SYMBOLS
# This must be done after the toolchain is setup, since we're looking at objcopy.
#
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what type of native debug symbols to use" >&5
+$as_echo_n "checking what type of native debug symbols to use... " >&6; }
+
+# Check whether --with-native-debug-symbols was given.
+if test "${with_native_debug_symbols+set}" = set; then :
+ withval=$with_native_debug_symbols;
+else
+ with_native_debug_symbols="zipped"
+fi
+
+ NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NATIVE_DEBUG_SYMBOLS" >&5
+$as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
+
+ if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
+
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+ if test "x$OBJCOPY" = x; then
+ # enabling of enable-debug-symbols and can't find objcopy
+ # this is an error
+ as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
+ fi
+ fi
+
+ ENABLE_DEBUG_SYMBOLS=true
+ ZIP_DEBUGINFO_FILES=true
+ DEBUG_BINARIES=true
+ STRIP_POLICY=min_strip
+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
+ ENABLE_DEBUG_SYMBOLS=false
+ ZIP_DEBUGINFO_FILES=false
+ DEBUG_BINARIES=false
+ STRIP_POLICY=no_strip
+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
+ ENABLE_DEBUG_SYMBOLS=false # -g option only
+ ZIP_DEBUGINFO_FILES=false
+ DEBUG_BINARIES=true
+ STRIP_POLICY=no_strip
+ STRIP=""
+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
+
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+ if test "x$OBJCOPY" = x; then
+ # enabling of enable-debug-symbols and can't find objcopy
+ # this is an error
+ as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
+ fi
+ fi
+
+ ENABLE_DEBUG_SYMBOLS=true
+ ZIP_DEBUGINFO_FILES=false
+ DEBUG_BINARIES=true
+ STRIP_POLICY=min_strip
+ else
+ as_fn_error $? "Allowed native debug symbols are: none, internal, external, zipped" "$LINENO" 5
+ fi
+
+ # --enable-debug-symbols is deprecated.
+ # Please use --with-native-debug-symbols=[internal,external,zipped] .
+
# Check whether --enable-debug-symbols was given.
if test "${enable_debug_symbols+set}" = set; then :
enableval=$enable_debug_symbols;
fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug symbols" >&5
-$as_echo_n "checking if we should generate debug symbols... " >&6; }
-
- if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
- # explicit enabling of enable-debug-symbols and can't find objcopy
- # this is an error
- as_fn_error $? "Unable to find objcopy, cannot enable debug-symbols" "$LINENO" 5
- fi
-
- if test "x$enable_debug_symbols" = "xyes"; then
- ENABLE_DEBUG_SYMBOLS=true
- elif test "x$enable_debug_symbols" = "xno"; then
- ENABLE_DEBUG_SYMBOLS=false
- else
- # Default is on if objcopy is found
- if test "x$OBJCOPY" != x; then
- ENABLE_DEBUG_SYMBOLS=true
- # MacOS X and Windows don't use objcopy but default is on for those OSes
- elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
- ENABLE_DEBUG_SYMBOLS=true
- else
- ENABLE_DEBUG_SYMBOLS=false
- fi
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_DEBUG_SYMBOLS" >&5
-$as_echo "$ENABLE_DEBUG_SYMBOLS" >&6; }
-
- #
- # ZIP_DEBUGINFO_FILES
- #
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
-$as_echo_n "checking if we should zip debug-info files... " >&6; }
+ if test "x$enable_debug_symbols" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-debug-symbols is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --enable-debug-symbols is deprecated and will be ignored." >&2;}
+
+ if test "xPlease use --with-native-debug-symbols=[internal,external,zipped] ." != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please use --with-native-debug-symbols=[internal,external,zipped] ." >&5
+$as_echo "$as_me: WARNING: Please use --with-native-debug-symbols=[internal,external,zipped] ." >&2;}
+ fi
+
+ fi
+
+
+ # --enable-zip-debug-info is deprecated.
+ # Please use --with-native-debug-symbols=zipped .
+
# Check whether --enable-zip-debug-info was given.
if test "${enable_zip_debug_info+set}" = set; then :
- enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}"
-else
- enable_zip_debug_info="yes"
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
-$as_echo "${enable_zip_debug_info}" >&6; }
-
- if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
- else
- ZIP_DEBUGINFO_FILES=true
- fi
+ enableval=$enable_zip_debug_info;
+fi
+
+ if test "x$enable_zip_debug_info" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-zip-debug-info is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --enable-zip-debug-info is deprecated and will be ignored." >&2;}
+
+ if test "xPlease use --with-native-debug-symbols=zipped ." != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please use --with-native-debug-symbols=zipped ." >&5
+$as_echo "$as_me: WARNING: Please use --with-native-debug-symbols=zipped ." >&2;}
+ fi
+
+ fi
+
+
+
+
@@ -47947,7 +48235,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -48121,7 +48415,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -48319,7 +48619,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -48494,7 +48800,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -48679,7 +48991,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -48871,7 +49189,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -49060,7 +49384,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -49254,7 +49584,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -49428,7 +49764,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -49626,7 +49968,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -49801,7 +50149,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -49986,7 +50340,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -50178,7 +50538,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -50367,7 +50733,13 @@
as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ MSVC_DLL="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -51746,7 +52118,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -51872,7 +52250,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -52107,7 +52491,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -52233,7 +52623,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -52567,7 +52963,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -52693,7 +53095,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -52903,7 +53311,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -53029,7 +53443,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -53230,7 +53650,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -53356,7 +53782,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -53557,7 +53989,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -53683,7 +54121,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -53885,7 +54329,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54011,7 +54461,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54214,7 +54670,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54340,7 +54802,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54539,7 +55007,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54665,7 +55139,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54864,7 +55344,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -54990,7 +55476,13 @@
as_fn_error $? "The path of POTENTIAL_FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ POTENTIAL_FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -55172,7 +55664,13 @@
as_fn_error $? "The path of FREETYPE_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ FREETYPE_INCLUDE_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
@@ -55306,7 +55804,13 @@
as_fn_error $? "The path of FREETYPE_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi
- FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ if test -d "$path"; then
+ FREETYPE_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ FREETYPE_LIB_PATH="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
fi
fi
--- a/common/autoconf/jdk-options.m4 Thu Dec 10 09:24:59 2015 -0800
+++ b/common/autoconf/jdk-options.m4 Wed Jul 05 21:07:00 2017 +0200
@@ -491,53 +491,74 @@
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
[
#
- # ENABLE_DEBUG_SYMBOLS
+ # NATIVE_DEBUG_SYMBOLS
# This must be done after the toolchain is setup, since we're looking at objcopy.
#
- AC_ARG_ENABLE([debug-symbols],
- [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
+ AC_MSG_CHECKING([what type of native debug symbols to use])
+ AC_ARG_WITH([native-debug-symbols],
+ [AS_HELP_STRING([--with-native-debug-symbols],
+ [set the native debug symbol configuration (none, internal, external, zipped) @<:@zipped@:>@])],
+ [],
+ [with_native_debug_symbols="zipped"])
+ NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
+ AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
- AC_MSG_CHECKING([if we should generate debug symbols])
+ if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
+
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+ if test "x$OBJCOPY" = x; then
+ # enabling of enable-debug-symbols and can't find objcopy
+ # this is an error
+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+ fi
+ fi
- if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
- # explicit enabling of enable-debug-symbols and can't find objcopy
- # this is an error
- AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
+ ENABLE_DEBUG_SYMBOLS=true
+ ZIP_DEBUGINFO_FILES=true
+ DEBUG_BINARIES=true
+ STRIP_POLICY=min_strip
+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
+ ENABLE_DEBUG_SYMBOLS=false
+ ZIP_DEBUGINFO_FILES=false
+ DEBUG_BINARIES=false
+ STRIP_POLICY=no_strip
+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
+ ENABLE_DEBUG_SYMBOLS=false # -g option only
+ ZIP_DEBUGINFO_FILES=false
+ DEBUG_BINARIES=true
+ STRIP_POLICY=no_strip
+ STRIP=""
+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
+
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+ if test "x$OBJCOPY" = x; then
+ # enabling of enable-debug-symbols and can't find objcopy
+ # this is an error
+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+ fi
+ fi
+
+ ENABLE_DEBUG_SYMBOLS=true
+ ZIP_DEBUGINFO_FILES=false
+ DEBUG_BINARIES=true
+ STRIP_POLICY=min_strip
+ else
+ AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])
fi
- if test "x$enable_debug_symbols" = "xyes"; then
- ENABLE_DEBUG_SYMBOLS=true
- elif test "x$enable_debug_symbols" = "xno"; then
- ENABLE_DEBUG_SYMBOLS=false
- else
- # Default is on if objcopy is found
- if test "x$OBJCOPY" != x; then
- ENABLE_DEBUG_SYMBOLS=true
- # MacOS X and Windows don't use objcopy but default is on for those OSes
- elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
- ENABLE_DEBUG_SYMBOLS=true
- else
- ENABLE_DEBUG_SYMBOLS=false
- fi
- fi
+ # --enable-debug-symbols is deprecated.
+ # Please use --with-native-debug-symbols=[internal,external,zipped] .
+ BASIC_DEPRECATED_ARG_ENABLE(debug-symbols, debug_symbols,
+ [Please use --with-native-debug-symbols=[[internal,external,zipped]] .])
- AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
+ # --enable-zip-debug-info is deprecated.
+ # Please use --with-native-debug-symbols=zipped .
+ BASIC_DEPRECATED_ARG_ENABLE(zip-debug-info, zip_debug_info,
+ [Please use --with-native-debug-symbols=zipped .])
- #
- # ZIP_DEBUGINFO_FILES
- #
- AC_MSG_CHECKING([if we should zip debug-info files])
- AC_ARG_ENABLE([zip-debug-info],
- [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
- [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
- AC_MSG_RESULT([${enable_zip_debug_info}])
-
- if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
- else
- ZIP_DEBUGINFO_FILES=true
- fi
-
+ AC_SUBST(NATIVE_DEBUG_SYMBOLS)
+ AC_SUBST(DEBUG_BINARIES)
+ AC_SUBST(STRIP_POLICY)
AC_SUBST(ENABLE_DEBUG_SYMBOLS)
AC_SUBST(ZIP_DEBUGINFO_FILES)
])
--- a/common/autoconf/spec.gmk.in Thu Dec 10 09:24:59 2015 -0800
+++ b/common/autoconf/spec.gmk.in Wed Jul 05 21:07:00 2017 +0200
@@ -271,6 +271,9 @@
# Number of parallel jobs to use for compilation
JOBS?=@JOBS@
+# Default make target
+DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
+
FREETYPE_LIBS:=@FREETYPE_LIBS@
FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
@@ -418,6 +421,9 @@
CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
+NATIVE_DEBUG_SYMBOLS:=@NATIVE_DEBUG_SYMBOLS@
+DEBUG_BINARIES:=@DEBUG_BINARIES@
+STRIP_POLICY:=@STRIP_POLICY@
#
# Compress (or not) jars
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/bin/jib.sh Wed Jul 05 21:07:00 2017 +0200
@@ -0,0 +1,127 @@
+#!/bin/bash
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This script installs the JIB tool into it's own local repository and
+# puts a wrapper scripts into <source-root>/.jib
+
+mydir="$(dirname "${BASH_SOURCE[0]}")"
+myname="$(basename "${BASH_SOURCE[0]}")"
+
+installed_jib_script=${mydir}/../../.jib/jib
+install_data=${mydir}/../../.jib/.data
+
+setup_url() {
+ if [ -f "~/.config/jib/jib.conf" ]; then
+ source ~/.config/jib/jib.conf
+ fi
+
+ jib_repository="jdk-virtual"
+ jib_organization="jpg/infra/builddeps"
+ jib_module="jib"
+ jib_revision="2.0-SNAPSHOT"
+ jib_ext="jib.sh.gz"
+
+ closed_script="${mydir}/../../closed/conf/jib-install.conf"
+ if [ -f "${closed_script}" ]; then
+ source "${closed_script}"
+ fi
+
+ if [ -n "${JIB_SERVER}" ]; then
+ jib_server="${JIB_SERVER}"
+ fi
+ if [ -n "${JIB_REPOSITORY}" ]; then
+ jib_repository="${JIB_REPOSITORY}"
+ fi
+ if [ -n "${JIB_ORGANIZATION}" ]; then
+ jib_organization="${JIB_ORGANIZATION}"
+ fi
+ if [ -n "${JIB_MODULE}" ]; then
+ jib_module="${JIB_MODULE}"
+ fi
+ if [ -n "${JIB_REVISION}" ]; then
+ jib_revision="${JIB_REVISION}"
+ fi
+ if [ -n "${JIB_EXTENSION}" ]; then
+ jib_extension="${JIB_EXTENSION}"
+ fi
+
+ if [ -n "${JIB_URL}" ]; then
+ jib_url="${JIB_URL}"
+ data_string="${jib_url}"
+ else
+ data_string="${jib_repository}/${jib_organization}/${jib_module}/${jib_revision}/${jib_module}-${jib_revision}.${jib_ext}"
+ jib_url="${jib_server}/${data_string}"
+ fi
+}
+
+install_jib() {
+ if [ -z "${jib_server}" -a -z "${JIB_URL}" ]; then
+ echo "No jib server or URL provided, set either"
+ echo "JIB_SERVER=<base server address>"
+ echo "or"
+ echo "JIB_URL=<full path to install script>"
+ exit 1
+ fi
+
+ if command -v curl > /dev/null; then
+ getcmd="curl -s"
+ elif command -v wget > /dev/null; then
+ getcmd="wget --quiet -O -"
+ else
+ echo "Could not find either curl or wget"
+ exit 1
+ fi
+
+ if ! command -v gunzip > /dev/null; then
+ echo "Could not find gunzip"
+ exit 1
+ fi
+
+ echo "Downloading JIB bootstrap script"
+ mkdir -p "${installed_jib_script%/*}"
+ rm -f "${installed_jib_script}.gz"
+ ${getcmd} ${jib_url} > "${installed_jib_script}.gz"
+ if [ ! -s "${installed_jib_script}.gz" ]; then
+ echo "Failed to download ${jib_url}"
+ exit 1
+ fi
+ echo "Extracting JIB bootstrap script"
+ rm -f "${installed_jib_script}"
+ gunzip "${installed_jib_script}.gz"
+ chmod +x "${installed_jib_script}"
+ echo "${data_string}" > "${install_data}"
+}
+
+# Main body starts here
+
+setup_url
+
+if [ ! -x "${installed_jib_script}" ]; then
+ install_jib
+elif [ ! -e "${install_data}" ] || [ "${data_string}" != "$(cat "${install_data}")" ]; then
+ echo "Install url changed since last time, reinstalling"
+ install_jib
+fi
+
+${installed_jib_script} "$@"
--- a/common/bin/unshuffle_list.txt Thu Dec 10 09:24:59 2015 -0800
+++ b/common/bin/unshuffle_list.txt Wed Jul 05 21:07:00 2017 +0200
@@ -1293,10 +1293,7 @@
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent/package.html : jdk/src/macosx/classes/com/apple/concurrent/package.html
-jdk/src/jdk.deploy.osx/macosx/classes/apple/applescript : jdk/src/macosx/classes/apple/applescript
-jdk/src/jdk.deploy.osx/macosx/classes/apple/security : jdk/src/macosx/classes/apple/security
jdk/src/jdk.deploy.osx/macosx/classes/com/apple/concurrent : jdk/src/macosx/classes/com/apple/concurrent
-jdk/src/jdk.deploy.osx/macosx/native/libapplescriptengine : jdk/src/macosx/native/apple/applescript
jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m
jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/conf/jib-profiles.js Wed Jul 05 21:07:00 2017 +0200
@@ -0,0 +1,555 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file defines build profiles for the JIB tool and others.
+ *
+ * A build profile defines a set of configuration options and external
+ * dependencies that we for some reason or other care about specifically.
+ * Typically, build profiles are defined for the build configurations we
+ * build regularly.
+ *
+ * Contract against this file from the tools that use it, is to provide
+ * a function on the form:
+ *
+ * getJibProfiles(input)
+ *
+ * which returns an object graph describing the profiles and their
+ * dependencies. The name of the function is based on the name of this
+ * file, minus the extension and the '-', camel cased and prefixed with
+ * 'get'.
+ *
+ *
+ * The parameter 'input' is an object that optionally contains some data.
+ * Optionally because a tool may read the configuration for different purposes.
+ * To initially get a list of available profiles, the active profile may not
+ * yet be known for instance.
+ *
+ * Data that may be set on the input object:
+ *
+ * input.profile = <name of active profile>
+ *
+ * If the active profile is set, the following data from it must also
+ * be provided:
+ *
+ * input.profile
+ * input.target_os
+ * input.target_cpu
+ * input.build_os
+ * input.build_cpu
+ * input.target_platform
+ * input.build_platform
+ * // The build_osenv_* variables describe the unix layer on Windows systems,
+ * // i.e. Cygwin, which may also be 32 or 64 bit.
+ * input.build_osenv
+ * input.build_osenv_cpu
+ * input.build_osenv_platform
+ *
+ * For more complex nested attributes, there is a method "get":
+ *
+ * input.get("<dependency>", "<attribute>")
+ *
+ * Valid attributes are:
+ * install_path
+ * download_path
+ * download_dir
+ *
+ *
+ * The output data generated by this configuration file has the following
+ * format:
+ *
+ * data: {
+ * // Identifies the version of this format to the tool reading it
+ * format_version: "1.0",
+ *
+ * // Name of base outputdir. JIB assumes the actual output dir is formed
+ * // by adding the configuration name: <output_basedir>/<config-name>
+ * output_basedir: "build",
+ * // Configure argument to use to specify configuration name
+ * configuration_configure_arg:
+ * // Make argument to use to specify configuration name
+ * configuration_make_arg:
+ *
+ * profiles: {
+ * <profile-name>: {
+ * // Name of os the profile is built to run on
+ * target_os; <string>
+ * // Name of cpu the profile is built to run on
+ * target_cpu; <string>
+ * // Combination of target_os and target_cpu for convenience
+ * target_platform; <string>
+ * // Name of os the profile is built on
+ * build_os; <string>
+ * // Name of cpu the profile is built on
+ * build_cpu; <string>
+ * // Combination of build_os and build_cpu for convenience
+ * build_platform; <string>
+ *
+ * // List of dependencies needed to build this profile
+ * dependencies: <Array of strings>
+ *
+ * // List of configure args to use for this profile
+ * configure_args: <Array of strings>
+ *
+ * // List of free form labels describing aspects of this profile
+ * labels: <Array of strings>
+ * }
+ * }
+ *
+ * // Dependencies use a Maven like deployment structure
+ * dependencies: {
+ * <dependency-name>: {
+ * // Organization part of path defining this dependency
+ * organization: <string>
+ * // File extension for this dependency
+ * ext: <string>
+ * // Module part of path for defining this dependency,
+ * // defaults to <dependency-name>
+ * module: <string>
+ * // Revision part of path for defining this dependency
+ * revision: <string>
+ *
+ * // List of configure args to add when using this dependency,
+ * // defaults to
+ * // "--with-<dependency-name>=input.get("<dependency-name", "install_path")"
+ * configure_args: <array of strings>
+ *
+ * // Name of environment variable to set when using this dependency
+ * // when running make
+ * environment_name: <string>
+ * // Value of environment variable to set when using this dependency
+ * // when running make
+ * environment_value: <string>
+ *
+ * // Value to add to the PATH variable when using this dependency,
+ * // applies to both make and configure
+ * environment_path: <string>
+ * }
+ *
+ * <dependency-name>: {
+ * // For certain dependencies where a legacy distribution mechanism is
+ * // already in place, the "javare" server layout is also supported
+ * // Indicate that an alternate server source and layout should be used
+ * server: "javare"
+ *
+ * // For "javare", a combination of module, revision,
+ * // build number (optional), files and checksum file is possible for
+ * // artifacts following the standard layout.
+ * module: <string>
+ * revision: <string>
+ * build_number: <string>
+ * checksum_file: <string>
+ * file: <string>
+ *
+ * // For other files, use checksum path and path instead
+ * checksum_path: <string>
+ * path: <string>
+ * }
+ * }
+ * }
+ */
+
+/**
+ * Main entry to generate the profile configuration
+ *
+ * @param input External data to use for generating the configuration
+ * @returns {{}} Profile configuration
+ */
+var getJibProfiles = function (input) {
+
+ var data = {};
+
+ // Identifies the version of this format to the tool reading it
+ data.format_version = "1.0";
+
+ // Organization is used when uploading/publishing build results
+ data.organization = "com.oracle.jpg.jdk";
+
+ // The base directory for the build output. JIB will assume that the
+ // actual build directory will be <output_basedir>/<configuration>
+ data.output_basedir = "build";
+ // The configure argument to use to specify the name of the configuration
+ data.configuration_configure_arg = "--with-conf-name=";
+ // The make argument to use to specify the name of the configuration
+ data.configuration_make_arg = "CONF_NAME=";
+
+ // Define some common values
+ var common = getJibProfilesCommon(input);
+ // Generate the profiles part of the configuration
+ data.profiles = getJibProfilesProfiles(input, common);
+ // Generate the dependencies part of the configuration
+ data.dependencies = getJibProfilesDependencies(input, common);
+
+ return data;
+};
+
+/**
+ * Generates some common values
+ *
+ * @param input External data to use for generating the configuration
+ * @returns Common values
+ */
+var getJibProfilesCommon = function (input) {
+ var common = {
+ dependencies: ["boot_jdk", "gnumake", "jtreg"],
+ configure_args: ["--with-default-make-target=all"],
+ configure_args_32bit: ["--with-target-bits=32", "--with-jvm-variants=client,server"],
+ configure_args_debug: ["--enable-debug"],
+ organization: "jpg.infra.builddeps"
+ };
+
+ return common;
+};
+
+/**
+ * Generates the profiles part of the configuration.
+ *
+ * @param input External data to use for generating the configuration
+ * @param common The common values
+ * @returns {{}} Profiles part of the configuration
+ */
+var getJibProfilesProfiles = function (input, common) {
+ var profiles = {};
+
+ // Main SE profiles
+ var mainProfiles = {
+
+ "linux-x64": {
+ target_os: "linux",
+ target_cpu: "x64",
+ dependencies: concat(common.dependencies, "devkit"),
+ configure_args: common.configure_args,
+ make_args: common.make_args
+ },
+
+ "linux-x86": {
+ target_os: "linux",
+ target_cpu: "x86",
+ build_cpu: "x64",
+ dependencies: concat(common.dependencies, "devkit"),
+ configure_args: concat(common.configure_args, common.configure_args_32bit),
+ make_args: common.make_args
+ },
+
+ "macosx-x64": {
+ target_os: "macosx",
+ target_cpu: "x64",
+ dependencies: concat(common.dependencies, "devkit"),
+ configure_args: concat(common.configure_args, "--with-sdk-name=macosx10.9"),
+ make_args: common.make_args
+ },
+
+ "solaris-x64": {
+ target_os: "solaris",
+ target_cpu: "x64",
+ dependencies: concat(common.dependencies, "devkit", "cups"),
+ configure_args: common.configure_args,
+ make_args: common.make_args
+ },
+
+ "solaris-sparcv9": {
+ target_os: "solaris",
+ target_cpu: "sparcv9",
+ dependencies: concat(common.dependencies, "devkit", "cups"),
+ configure_args: common.configure_args,
+ make_args: common.make_args
+ },
+
+ "windows-x64": {
+ target_os: "windows",
+ target_cpu: "x64",
+ dependencies: concat(common.dependencies, "devkit", "freetype"),
+ configure_args: common.configure_args,
+ make_args: common.make_args
+ },
+
+ "windows-x86": {
+ target_os: "windows",
+ target_cpu: "x86",
+ build_cpu: "x64",
+ dependencies: concat(common.dependencies, "devkit", "freetype"),
+ configure_args: concat(common.configure_args, common.configure_args_32bit),
+ make_args: common.make_args
+ }
+ };
+ profiles = concatObjects(profiles, mainProfiles);
+ // Generate debug versions of all the main profiles
+ profiles = concatObjects(profiles, generateDebugProfiles(common, mainProfiles));
+
+ // Specific open profiles needed for JPRT testing
+ var jprtOpenProfiles = {
+
+ "linux-x64-open": {
+ target_os: mainProfiles["linux-x64"].target_os,
+ target_cpu: mainProfiles["linux-x64"].target_cpu,
+ dependencies: mainProfiles["linux-x64"].dependencies,
+ configure_args: concat(mainProfiles["linux-x64"].configure_args,
+ "--enable-openjdk-only"),
+ make_args: mainProfiles["linux-x64"].make_args,
+ labels: [ "open" ]
+ },
+
+ "solaris-x64-open": {
+ target_os: mainProfiles["solaris-x64"].target_os,
+ target_cpu: mainProfiles["solaris-x64"].target_cpu,
+ dependencies: mainProfiles["solaris-x64"].dependencies,
+ configure_args: concat(mainProfiles["solaris-x64"].configure_args,
+ "--enable-openjdk-only"),
+ make_args: mainProfiles["solaris-x64"].make_args,
+ labels: [ "open" ]
+ }
+ };
+ profiles = concatObjects(profiles, jprtOpenProfiles);
+ // Generate debug profiles for the open jprt profiles
+ profiles = concatObjects(profiles, generateDebugProfiles(common, jprtOpenProfiles));
+
+ // Profiles used to run tests. Used in JPRT.
+ var testOnlyProfiles = {
+
+ "run-test": {
+ target_os: input.build_os,
+ target_cpu: input.build_cpu,
+ dependencies: [ "jtreg", "gnumake" ],
+ labels: "test"
+ }
+ };
+ profiles = concatObjects(profiles, testOnlyProfiles);
+
+ // Generate the missing platform attributes
+ profiles = generatePlatformAttributes(profiles);
+ return profiles;
+};
+
+/**
+ * Generate the dependencies part of the configuration
+ *
+ * @param input External data to use for generating the configuration
+ * @param common The common values
+ * @returns {{}} Dependencies part of configuration
+ */
+var getJibProfilesDependencies = function (input, common) {
+
+ var boot_jdk_platform = input.build_os + "-"
+ + (input.build_cpu == "x86" ? "i586" : input.build_cpu);
+
+ var devkit_platform_revisions = {
+ linux_x64: "gcc4.9.2-OEL6.4+1.0",
+ macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
+ solaris_x64: "SS12u3-Solaris10u10+1.0",
+ solaris_sparcv9: "SS12u3-Solaris10u10+1.0",
+ windows_x64: "VS2013SP4+1.0"
+ };
+
+ var devkit_platform = (input.target_cpu == "x86"
+ ? input.target_os + "_x64"
+ : input.target_platform);
+
+ var dependencies = {
+
+ boot_jdk: {
+ server: "javare",
+ module: "jdk",
+ revision: "8",
+ checksum_file: boot_jdk_platform + "/MD5_VALUES",
+ file: boot_jdk_platform + "/jdk-8-" + boot_jdk_platform + ".tar.gz",
+ configure_args: (input.build_os == "macosx"
+ ? "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk1.8.0.jdk/Contents/Home"
+ : "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk1.8.0")
+ },
+
+ devkit: {
+ organization: common.organization,
+ ext: "tar.gz",
+ module: "devkit-" + devkit_platform,
+ revision: devkit_platform_revisions[devkit_platform]
+ },
+
+ build_devkit: {
+ organization: common.organization,
+ ext: "tar.gz",
+ module: "devkit-" + input.build_platform,
+ revision: devkit_platform_revisions[input.build_platform]
+ },
+
+ cups: {
+ organization: common.organization,
+ ext: "tar.gz",
+ revision: "1.0118+1.0"
+ },
+
+ jtreg: {
+ server: "javare",
+ revision: "4.1",
+ build_number: "b12",
+ checksum_file: "MD5_VALUES",
+ file: "jtreg_bin-4.1.zip",
+ environment_name: "JT_HOME"
+ },
+
+ gnumake: {
+ organization: common.organization,
+ ext: "tar.gz",
+ revision: "4.0+1.0",
+
+ module: (input.build_os == "windows"
+ ? "gnumake-" + input.build_osenv_platform
+ : "gnumake-" + input.build_platform),
+
+ configure_args: (input.build_os == "windows"
+ ? "MAKE=" + input.get("gnumake", "install_path") + "/cygwin/bin/make"
+ : "MAKE=" + input.get("gnumake", "install_path") + "/bin/make"),
+
+ environment_path: (input.build_os == "windows"
+ ? input.get("gnumake", "install_path") + "/cygwin/bin"
+ : input.get("gnumake", "install_path") + "/bin")
+ },
+
+ freetype: {
+ organization: common.organization,
+ ext: "tar.gz",
+ revision: "2.3.4+1.0",
+ module: "freetype-" + input.target_platform
+ }
+ };
+
+ return dependencies;
+};
+
+/**
+ * Generate the missing platform attributes for profiles
+ *
+ * @param profiles Profiles map to generate attributes on
+ * @returns {{}} New profiles map with platform attributes fully filled in
+ */
+var generatePlatformAttributes = function (profiles) {
+ var ret = concatObjects(profiles, {});
+ for (var profile in profiles) {
+ if (ret[profile].build_os == null) {
+ ret[profile].build_os = ret[profile].target_os;
+ }
+ if (ret[profile].build_cpu == null) {
+ ret[profile].build_cpu = ret[profile].target_cpu;
+ }
+ ret[profile].target_platform = ret[profile].target_os + "_" + ret[profile].target_cpu;
+ ret[profile].build_platform = ret[profile].build_os + "_" + ret[profile].build_cpu;
+ }
+ return ret;
+};
+
+/**
+ * Generates debug versions of profiles. Clones the given profiles and adds
+ * debug metadata.
+ *
+ * @param common Common values
+ * @param profiles Profiles map to generate debug profiles for
+ * @returns {{}} New map of profiles containing debug profiles
+ */
+var generateDebugProfiles = function (common, profiles) {
+ var newProfiles = {};
+ for (var profile in profiles) {
+ var debugProfile = profile + "-debug";
+ newProfiles[debugProfile] = clone(profiles[profile]);
+ newProfiles[debugProfile].debug_level = "fastdebug";
+ newProfiles[debugProfile].labels
+ = concat(newProfiles[debugProfile].labels || [], "debug"),
+ newProfiles[debugProfile].configure_args
+ = concat(newProfiles[debugProfile].configure_args,
+ common.configure_args_debug);
+ }
+ return newProfiles;
+};
+
+/**
+ * Deep clones an object tree.
+ *
+ * @param o Object to clone
+ * @returns {{}} Clone of o
+ */
+var clone = function (o) {
+ return JSON.parse(JSON.stringify(o));
+};
+
+/**
+ * Concatenates all arguments into a new array
+ *
+ * @returns {Array.<T>} New array containing all arguments
+ */
+var concat = function () {
+ return Array.prototype.concat.apply([], arguments);
+};
+
+/**
+ * Copies all elements in an array into a new array but replacing all
+ * occurrences of original with replacement.
+ *
+ * @param original Element to look for
+ * @param replacement Element to replace with
+ * @param a Array to copy
+ * @returns {Array} New array with all occurrences of original replaced
+ * with replacement
+ */
+var replace = function (original, replacement, a) {
+ var newA = [];
+ for (var i in a) {
+ if (original == a[i]) {
+ newA.push(replacement);
+ } else {
+ newA.push(a[i]);
+ }
+ }
+ return newA;
+};
+
+/**
+ * Deep concatenation of two objects. For each node encountered, merge
+ * the contents with the corresponding node in the other object tree,
+ * treating all strings as array elements.
+ *
+ * @param o1 Object to concatenate
+ * @param o2 Object to concatenate
+ * @returns {{}} New object tree containing the concatenation of o1 and o2
+ */
+var concatObjects = function (o1, o2) {
+ var ret = {};
+ for (var a in o1) {
+ if (o2[a] == null) {
+ ret[a] = o1[a];
+ }
+ }
+ for (var a in o2) {
+ if (o1[a] == null) {
+ ret[a] = o2[a];
+ } else {
+ if (typeof o1[a] == 'string') {
+ ret[a] = [o1[a]].concat(o2[a]);
+ } else if (Array.isArray(o1[a])) {
+ ret[a] = o1[a].concat(o2[a]);
+ } else if (typeof o1[a] == 'object') {
+ ret[a] = concatObjects(o1[a], o2[a]);
+ }
+ }
+ }
+ return ret;
+};
--- a/make/CompileJavaModules.gmk Thu Dec 10 09:24:59 2015 -0800
+++ b/make/CompileJavaModules.gmk Wed Jul 05 21:07:00 2017 +0200
@@ -556,7 +556,7 @@
ifneq ($(BUILD_CRYPTO), true)
CLASSPATH += $(JDK_OUTPUTDIR)/modules/$(MODULE)
endif
-JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) \
+JAVAC_FLAGS_BOOTCLASSPATH := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) \
-endorseddirs $(EMPTY_DIR) $($(MODULE)_ADD_JAVAC_FLAGS)
$(eval $(call SetupJavaCompilation, $(MODULE), \
@@ -566,7 +566,7 @@
BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules/$(MODULE)), \
HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$(MODULE), \
CLASSPATH := $(CLASSPATH), \
- ADD_JAVAC_FLAGS := $($(MODULE)_ADD_JAVAC_FLAGS) $(JAVAC_FLAGS) \
+ ADD_JAVAC_FLAGS := $($(MODULE)_ADD_JAVAC_FLAGS) $(JAVAC_FLAGS_BOOTCLASSPATH) \
))
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
--- a/make/Help.gmk Thu Dec 10 09:24:59 2015 -0800
+++ b/make/Help.gmk Wed Jul 05 21:07:00 2017 +0200
@@ -75,6 +75,7 @@
$(info $(_) CONF= # Build all configurations (note, assignment is empty))
$(info $(_) CONF=<substring> # Build the configuration(s) with a name matching)
$(info $(_) # <substring>)
+ $(info $(_) CONF_NAME=<string> # Build the configuration with exactly the <string>)
$(info $(_) SPEC=<spec file> # Build the configuration given by the spec file)
$(info $(_) LOG=<loglevel> # Change the log level from warn to <loglevel>)
$(info $(_) # Available log levels are:)
--- a/make/InitSupport.gmk Thu Dec 10 09:24:59 2015 -0800
+++ b/make/InitSupport.gmk Wed Jul 05 21:07:00 2017 +0200
@@ -40,7 +40,7 @@
##############################################################################
# Make control variables, handled by Init.gmk
- INIT_CONTROL_VARIABLES := LOG CONF SPEC JOBS CONF_CHECK COMPARE_BUILD
+ INIT_CONTROL_VARIABLES := LOG CONF CONF_NAME SPEC JOBS CONF_CHECK COMPARE_BUILD
# All known make control variables
MAKE_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) TEST JDK_FILTER
@@ -169,6 +169,11 @@
$$(info Error: Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
$$(error Cannot continue)
endif
+ ifneq ($$(origin CONF_NAME), undefined)
+ # We also have a CONF_NAME argument. We can't have both.
+ $$(info Error: Cannot use CONF_NAME=$$(CONF_NAME) and SPEC=$$(SPEC) at the same time. Choose one.)
+ $$(error Cannot continue)
+ endif
ifeq ($$(wildcard $$(SPEC)),)
$$(info Error: Cannot locate spec.gmk, given by SPEC=$$(SPEC).)
$$(error Cannot continue)
@@ -191,7 +196,29 @@
$$(error Cannot continue)
endif
- ifneq ($$(origin CONF), undefined)
+ ifneq ($$(origin CONF_NAME), undefined)
+ ifneq ($$(origin CONF), undefined)
+ # We also have a CONF argument. We can't have both.
+ $$(info Error: Cannot use CONF=$$(CONF) and CONF_NAME=$$(CONF_NAME) at the same time. Choose one.)
+ $$(error Cannot continue)
+ endif
+ matching_conf := $$(strip $$(filter $$(CONF_NAME), $$(all_confs)))
+ ifeq ($$(matching_conf),)
+ $$(info Error: No configurations found matching CONF_NAME=$$(CONF_NAME).)
+ $$(info Available configurations in $$(build_dir):)
+ $$(foreach var, $$(all_confs), $$(info * $$(var)))
+ $$(error Cannot continue)
+ else ifneq ($$(words $$(matching_conf)), 1)
+ $$(info Error: Matching more than one configuration CONF_NAME=$$(CONF_NAME).)
+ $$(info Available configurations in $$(build_dir):)
+ $$(foreach var, $$(all_confs), $$(info * $$(var)))
+ $$(error Cannot continue)
+ else
+ $$(info Building configuration '$$(matching_conf)' (matching CONF_NAME=$$(CONF_NAME)))
+ endif
+ # Create a SPEC definition. This will contain the path to exactly one spec file.
+ SPECS := $$(build_dir)/$$(matching_conf)/spec.gmk
+ else ifneq ($$(origin CONF), undefined)
# User have given a CONF= argument.
ifeq ($$(CONF),)
# If given CONF=, match all configurations
--- a/make/Main.gmk Thu Dec 10 09:24:59 2015 -0800
+++ b/make/Main.gmk Wed Jul 05 21:07:00 2017 +0200
@@ -554,7 +554,7 @@
# Traditional targets typically run by users.
# These can be considered aliases for the targets now named by a more
# "modern" naming scheme.
-default: exploded-image
+default: $(DEFAULT_MAKE_TARGET)
jdk: exploded-image
images: product-images
docs: docs-image
--- a/make/common/NativeCompilation.gmk Thu Dec 10 09:24:59 2015 -0800
+++ b/make/common/NativeCompilation.gmk Wed Jul 05 21:07:00 2017 +0200
@@ -513,6 +513,10 @@
$1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
endif
+ ifeq ($(DEBUG_BINARIES), true)
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+ endif
ifeq ($$($1_DEBUG_SYMBOLS), true)
ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
ifdef OPENJDK
--- a/modules.xml Thu Dec 10 09:24:59 2015 -0800
+++ b/modules.xml Wed Jul 05 21:07:00 2017 +0200
@@ -1655,7 +1655,6 @@
<name>jdk.deploy.osx</name>
<depend>java.base</depend>
<depend>java.desktop</depend>
- <depend>java.scripting</depend>
</module>
<module>
<name>jdk.dev</name>
--- a/test/lib/sun/hotspot/WhiteBox.java Thu Dec 10 09:24:59 2015 -0800
+++ b/test/lib/sun/hotspot/WhiteBox.java Wed Jul 05 21:07:00 2017 +0200
@@ -32,6 +32,7 @@
import java.util.function.Function;
import java.security.BasicPermission;
import java.util.Objects;
+import jdk.internal.HotSpotIntrinsicCandidate;
import sun.hotspot.parser.DiagnosticCommand;
@@ -170,6 +171,9 @@
public native boolean shouldPrintAssembly(Executable method);
public native int deoptimizeFrames(boolean makeNotEntrant);
public native void deoptimizeAll();
+
+ @HotSpotIntrinsicCandidate
+ public void deoptimize() {}
public boolean isMethodCompiled(Executable method) {
return isMethodCompiled(method, false /*not osr*/);
}
@@ -304,6 +308,8 @@
}
public native Object[] getCodeBlob(long addr);
+ public native void clearInlineCaches();
+
// Intered strings
public native boolean isInStringTable(String str);