--- a/.hgtags-top-repo Tue Jan 31 14:47:57 2017 -0800
+++ b/.hgtags-top-repo Wed Jul 05 22:45:29 2017 +0200
@@ -396,3 +396,4 @@
71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151
ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152
816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153
+8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
--- a/common/autoconf/generated-configure.sh Tue Jan 31 14:47:57 2017 -0800
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 22:45:29 2017 +0200
@@ -5180,7 +5180,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1484571183
+DATE_WHEN_GENERATED=1485508515
###############################################################################
#
@@ -31283,12 +31283,6 @@
if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
fi
- # Workaround for using different imported module-info.java in Jake due to a
- # change in format. Remove once new format is standard in JDK 9 and javafx
- # delivers just that.
- if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then
- IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC"
- fi
if test -d "$IMPORT_MODULES_TOPDIR/make"; then
IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
fi
--- a/common/autoconf/source-dirs.m4 Tue Jan 31 14:47:57 2017 -0800
+++ b/common/autoconf/source-dirs.m4 Wed Jul 05 22:45:29 2017 +0200
@@ -114,12 +114,6 @@
if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
fi
- # Workaround for using different imported module-info.java in Jake due to a
- # change in format. Remove once new format is standard in JDK 9 and javafx
- # delivers just that.
- if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then
- IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC"
- fi
if test -d "$IMPORT_MODULES_TOPDIR/make"; then
IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
fi
--- a/common/conf/jib-profiles.js Tue Jan 31 14:47:57 2017 -0800
+++ b/common/conf/jib-profiles.js Wed Jul 05 22:45:29 2017 +0200
@@ -610,6 +610,19 @@
}
profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
+ // On macosx add the devkit bin dir to the path in all the run-test profiles.
+ // This gives us a guaranteed working version of lldb for the jtreg failure handler.
+ if (input.build_os == "macosx") {
+ macosxRunTestExtra = {
+ dependencies: [ "devkit" ],
+ environment_path: input.get("devkit", "install_path")
+ + "/Xcode.app/Contents/Developer/usr/bin"
+ }
+ profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
+ profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
+ profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
+ }
+
//
// Define artifacts for profiles
//
@@ -844,7 +857,7 @@
file: boot_jdk_platform + "/jdk-" + common.boot_jdk_revision
+ "-" + boot_jdk_platform + ".tar.gz",
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
- environment_path: common.boot_jdk_home
+ environment_path: common.boot_jdk_home + "/bin"
},
devkit: {
--- a/hotspot/.hgtags Tue Jan 31 14:47:57 2017 -0800
+++ b/hotspot/.hgtags Wed Jul 05 22:45:29 2017 +0200
@@ -556,3 +556,4 @@
2a2ac7d9f52c8cb2b80077e515b5840b947e640c jdk-9+151
31f1d26c60df7b2e516a4f84160d76ba017d4e09 jdk-9+152
217ba81b9a4ce8698200370175aa2db86a39f66c jdk-9+153
+a9fdfd55835ef9dccb7f317b07249bd66653b874 jdk-9+154
--- a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp Tue Jan 31 14:47:57 2017 -0800
+++ b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp Wed Jul 05 22:45:29 2017 +0200
@@ -46,7 +46,10 @@
#define DEFAULT_STACK_YELLOW_PAGES (2)
#define DEFAULT_STACK_RED_PAGES (1)
-#define DEFAULT_STACK_SHADOW_PAGES (4 DEBUG_ONLY(+5))
+// Java_java_net_SocketOutputStream_socketWrite0() uses a 64k buffer on the
+// stack if compiled for unix and LP64. To pass stack overflow tests we need
+// 20 shadow pages.
+#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+5))
#define DEFAULT_STACK_RESERVED_PAGES (0)
#define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES
--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp Tue Jan 31 14:47:57 2017 -0800
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp Wed Jul 05 22:45:29 2017 +0200
@@ -475,9 +475,9 @@
// Minimum usable stack sizes required to get to user code. Space for
// HotSpot guard pages is added later.
-size_t os::Posix::_compiler_thread_min_stack_allowed = 32 * K;
-size_t os::Posix::_java_thread_min_stack_allowed = 32 * K;
-size_t os::Posix::_vm_internal_thread_min_stack_allowed = 64 * K;
+size_t os::Posix::_compiler_thread_min_stack_allowed = 72 * K;
+size_t os::Posix::_java_thread_min_stack_allowed = 72 * K;
+size_t os::Posix::_vm_internal_thread_min_stack_allowed = 72 * K;
// return default stack size for thr_type
size_t os::Posix::default_stack_size(os::ThreadType thr_type) {
--- a/make/Javadoc.gmk Tue Jan 31 14:47:57 2017 -0800
+++ b/make/Javadoc.gmk Wed Jul 05 22:45:29 2017 +0200
@@ -26,6 +26,7 @@
include $(SPEC)
include MakeBase.gmk
+include $(JDK_TOPDIR)/make/Tools.gmk
################################################################################
@@ -180,6 +181,8 @@
-tag see \
-tag 'jvms:a:See <cite>The Java™ Virtual Machine Specification</cite>:' \
-tag 'jls:a:See <cite>The Java™ Language Specification</cite>:' \
+ -taglet build.tools.taglet.Incubating \
+ -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
#
DEFAULT_JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
@@ -311,7 +314,7 @@
$1_INDEX_FILE := $$(JAVADOC_OUTPUTDIR)/$$($1_OUTPUT_DIRNAME)/index.html
# Rule for actually running javadoc
- $$($1_INDEX_FILE): $$($1_VARDEPS_FILE) $$($1_PACKAGE_DEPS) $$($1_DEPS)
+ $$($1_INDEX_FILE): $(BUILD_TOOLS_JDK) $$($1_VARDEPS_FILE) $$($1_PACKAGE_DEPS) $$($1_DEPS)
$$(call LogWarn, Generating Javadoc from $$(words $$($1_PACKAGES)) package(s) for $$($1_OUTPUT_DIRNAME))
$$(call MakeDir, $$(@D))
ifneq ($$($1_PACKAGES_FILE), )
@@ -740,7 +743,7 @@
################################################################################
-docs-javadoc: $(TARGETS)
+docs-javadoc: $(BUILD_TOOLS_JDK) $(TARGETS)
docs-copy: $(COPY_TARGETS)
--- a/make/common/Modules.gmk Tue Jan 31 14:47:57 2017 -0800
+++ b/make/common/Modules.gmk Wed Jul 05 22:45:29 2017 +0200
@@ -182,15 +182,12 @@
# Find all module-info.java files for the current build target platform and
# configuration.
-# TODO: The $(firstword call is part of a workaround for using different
-# imported module-info.java in Jake due to a change in format. Remove once
-# new format is standard in JDK 9 and javafx delivers just that.
# Param 1 - Module to find for, set to * for finding all
FindAllModuleInfos = \
$(wildcard \
$(foreach sub, $(SRC_SUBDIRS), \
$(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
- $(patsubst %,%/$(strip $1)/module-info.java, $(firstword $(IMPORT_MODULES_SRC))))
+ $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
# Find module-info.java files in the specific source dir
# Param 1 - Src dir to find module-info.java files in