All -
These are the changes to flip the switches in JPRT (our internal
build/test grid) to build JDK 9 using Mac OS 'Maverics' and clang/Xcode
5.1.1.
The change is in one file: make/jprt.properties. There are no other
source changes.
The bug report:
https://bugs.openjdk.java.net/browse/JDK-8061346
The webrev (also included below since it is short and simple):
http://cr.openjdk.java.net/~tbell/8061346/
Testing:
- Ran test builds and inspected the configure and build logs to
confirm that clang was used.
- The built binaries passed these smoke tests:
macosx_x64-product-c2-jdk_lang
macosx_x64-product-c2-jdk_math
macosx_x64-product-c2-jdk_util
macosx_x64-product-c2-jvm98
macosx_x64-product-c2-langtools_jtreg
macosx_x64-product-c2-scimark
Thanks in advance-
Tim
diff --git a/make/jprt.properties b/make/jprt.properties
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -125,7 +125,7 @@
solaris_x64_5.11-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{product|fastdebug}, \
+ macosx_x64_10.9-{product|fastdebug}, \
windows_i586_6.1-{product|fastdebug}, \
windows_x64_6.1-{product|fastdebug}
@@ -135,7 +135,7 @@
solaris_x64_5.11-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
- macosx_x64_10.7-product-c2-TESTNAME, \
+ macosx_x64_10.9-product-c2-TESTNAME, \
windows_i586_6.1-product-c1-TESTNAME, \
windows_x64_6.1-product-c2-TESTNAME
@@ -239,7 +239,7 @@
solaris_x64_5.11-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug|optimized}, \
- macosx_x64_10.7-{product|fastdebug}, \
+ macosx_x64_10.9-{product|fastdebug}, \
windows_i586_6.1-{product|fastdebug}, \
windows_x64_6.1-{product|fastdebug|optimized}, \
solaris_x64_5.11-{debugOpen}, \
@@ -347,25 +347,25 @@
linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
my.test.targets.hotspot.macosx.x64= \
- macosx_x64_10.7-{product|fastdebug}-c2-jvm98, \
- macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered, \
- macosx_x64_10.7-{product|fastdebug}-c2-scimark, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParNewGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCOld_SerialGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParNewGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC
+ macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jvm98_nontiered, \
+ macosx_x64_10.9-{product|fastdebug}-c2-scimark, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCOld_SerialGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCOld_CMS, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCOld_G1, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
my.test.targets.hotspot.windows.i586= \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -454,7 +454,7 @@
solaris_x64_5.11-*-c2-hotspot_servertest, \
linux_i586_2.6-*-c2-hotspot_servertest, \
linux_x64_2.6-*-c2-hotspot_servertest, \
- macosx_x64_10.7-*-c2-hotspot_servertest, \
+ macosx_x64_10.9-*-c2-hotspot_servertest, \
windows_i586_6.1-*-c2-hotspot_servertest, \
windows_x64_6.1-*-c2-hotspot_servertest
@@ -463,7 +463,7 @@
solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \
linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \
linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \
- macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests, \
+ macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests, \
windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \
windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
@@ -472,7 +472,7 @@
solaris_x64_5.11-fastdebug-c2-GROUP, \
linux_i586_2.6-fastdebug-c2-GROUP, \
linux_x64_2.6-fastdebug-c2-GROUP, \
- macosx_x64_10.7-fastdebug-c2-GROUP, \
+ macosx_x64_10.9-fastdebug-c2-GROUP, \
windows_i586_6.1-fastdebug-c2-GROUP, \
windows_x64_6.1-fastdebug-c2-GROUP, \
linux_i586_2.6-fastdebug-c1-GROUP, \
