--- a/.hgtags-top-repo Sun Apr 03 16:38:10 2016 +0300
+++ b/.hgtags-top-repo Wed Jul 05 21:30:52 2017 +0200
@@ -354,3 +354,4 @@
1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109
925be13b3740d07a5958ccb5ab3c0ae1baba7055 jdk-9+110
f900d5afd9c83a0df8f36161c27c5e4c86a66f4c jdk-9+111
+03543a758cd5890f2266e4b9678378a925dde22a jdk-9+112
--- a/common/conf/jib-profiles.js Sun Apr 03 16:38:10 2016 +0300
+++ b/common/conf/jib-profiles.js Wed Jul 05 21:30:52 2017 +0200
@@ -241,8 +241,7 @@
target_os: "linux",
target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"),
- configure_args: common.configure_args,
- configure_args: concat(common.configure_args, "--with-zlib=system"),
+ configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
@@ -251,8 +250,8 @@
target_cpu: "x86",
build_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"),
- configure_args: concat(common.configure_args, common.configure_args_32bit),
- configure_args: concat(common.configure_args, "--with-zlib=system"),
+ configure_args: concat(common.configure_args, common.configure_args_32bit,
+ "--with-zlib=system"),
make_args: common.make_args
},
@@ -260,8 +259,7 @@
target_os: "macosx",
target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"),
- configure_args: common.configure_args,
- configure_args: concat(common.configure_args, "--with-zlib=system"),
+ configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
@@ -269,8 +267,7 @@
target_os: "solaris",
target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit", "cups"),
- configure_args: common.configure_args,
- configure_args: concat(common.configure_args, "--with-zlib=system"),
+ configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
@@ -278,8 +275,7 @@
target_os: "solaris",
target_cpu: "sparcv9",
dependencies: concat(common.dependencies, "devkit", "cups"),
- configure_args: common.configure_args,
- configure_args: concat(common.configure_args, "--with-zlib=system"),
+ configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args
},
--- a/hotspot/.hgtags Sun Apr 03 16:38:10 2016 +0300
+++ b/hotspot/.hgtags Wed Jul 05 21:30:52 2017 +0200
@@ -514,3 +514,4 @@
7e7e50ac4faf19899fc811569e32cfa478759ebb jdk-9+109
2f5d1578b24060ea06bd1f340a124db95d1475b2 jdk-9+110
c558850fac5750d8ca98a45180121980f57cdd28 jdk-9+111
+76582e8dc9e6374e4f99ab797c8d364b6e9449b4 jdk-9+112
--- a/make/common/Modules.gmk Sun Apr 03 16:38:10 2016 +0300
+++ b/make/common/Modules.gmk Wed Jul 05 21:30:52 2017 +0200
@@ -252,8 +252,9 @@
# * PLATFORM_MODULES
# * JRE_TOOL_MODULES
define ReadImportMetaData
- IMPORTED_MODULES := $(call FindImportedModules)
- $(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadImportMetaData, $m)))
+ IMPORTED_MODULES := $$(call FindImportedModules)
+ $$(foreach m, $$(IMPORTED_MODULES), \
+ $$(eval $$(call ReadSingleImportMetaData, $$m)))
endef
################################################################################
--- a/make/test/BuildTestLib.gmk Sun Apr 03 16:38:10 2016 +0300
+++ b/make/test/BuildTestLib.gmk Wed Jul 05 21:30:52 2017 +0200
@@ -38,7 +38,7 @@
$(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \
SRC := $(TEST_LIB_SOURCE_DIR)/sun, \
- BIN := $(TEST_LIB_SUPPORT), \
+ BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
ADD_JAVAC_FLAGS := $(JAVAC_WARNINGS), \
))
@@ -49,7 +49,7 @@
$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \
SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \
- BIN := $(TEST_LIB_SUPPORT), \
+ BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
))