Merge
authorddehaven
Tue, 06 Oct 2015 12:51:53 -0700
changeset 33034 7d4a8d4c3f24
parent 33033 74889aa3f5af (diff)
parent 32917 8392405ab038 (current diff)
child 33035 d00018a62f23
Merge
corba/make/CompileInterim.gmk
hotspot/test/gc/logging/TestPrintReferences.java
hotspot/test/gc/startup_warnings/TestDefaultMaxRAMFraction.java
hotspot/test/gc/startup_warnings/TestNoParNew.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/Datatype.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeBuilder.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeException.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeLibrary.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/ValidationContext.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaBeansAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaNetInetAddressAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java
jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java
jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java
jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java
jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java
nashorn/test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java
--- a/make/jprt.properties	Wed Jul 05 20:52:37 2017 +0200
+++ b/make/jprt.properties	Tue Oct 06 12:51:53 2015 -0700
@@ -127,6 +127,8 @@
     ${jprt.i586.build.configure.args}
 jprt.windows_x64.build.configure.args=					\
     --with-devkit=$VS2013_HOME
+jprt.macosx_x64.build.configure.args=                    \
+    --with-devkit=$XCODE_511_HOME
 
 ########
 #