--- a/.hgtags-top-repo Thu Mar 10 09:50:18 2016 -0800
+++ b/.hgtags-top-repo Wed Jul 05 21:26:22 2017 +0200
@@ -351,3 +351,4 @@
54575d8783b3a39a2d710c28cda675d44261f9d9 jdk-9+106
4d65eba233a8730f913734a6804910b842d2cb54 jdk-9+107
c7be2a78c31b3b6132f2f5e9e4b3d3bb1c20245c jdk-9+108
+1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109
--- a/common/autoconf/generated-configure.sh Thu Mar 10 09:50:18 2016 -0800
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 21:26:22 2017 +0200
@@ -4005,7 +4005,7 @@
devkit)
PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
openjdk)
- PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
+ PKGHANDLER_COMMAND="sudo apt-get install openjdk-8-jdk" ;;
alsa)
PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
cups)
@@ -4026,7 +4026,7 @@
devkit)
PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
openjdk)
- PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
+ PKGHANDLER_COMMAND="sudo yum install java-1.8.0-openjdk-devel" ;;
alsa)
PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
cups)
@@ -4862,7 +4862,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1456136781
+DATE_WHEN_GENERATED=1457684806
###############################################################################
#
@@ -15118,6 +15118,10 @@
REQUIRED_OS_NAME=Darwin
REQUIRED_OS_VERSION=11.2
fi
+ if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+ REQUIRED_OS_NAME=AIX
+ REQUIRED_OS_VERSION=7.1
+ fi
--- a/common/autoconf/help.m4 Thu Mar 10 09:50:18 2016 -0800
+++ b/common/autoconf/help.m4 Wed Jul 05 21:26:22 2017 +0200
@@ -106,7 +106,7 @@
devkit)
PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
openjdk)
- PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
+ PKGHANDLER_COMMAND="sudo apt-get install openjdk-8-jdk" ;;
alsa)
PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
cups)
@@ -127,7 +127,7 @@
devkit)
PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
openjdk)
- PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
+ PKGHANDLER_COMMAND="sudo yum install java-1.8.0-openjdk-devel" ;;
alsa)
PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
cups)
--- a/common/autoconf/platform.m4 Thu Mar 10 09:50:18 2016 -0800
+++ b/common/autoconf/platform.m4 Wed Jul 05 21:26:22 2017 +0200
@@ -406,6 +406,10 @@
REQUIRED_OS_NAME=Darwin
REQUIRED_OS_VERSION=11.2
fi
+ if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+ REQUIRED_OS_NAME=AIX
+ REQUIRED_OS_VERSION=7.1
+ fi
AC_SUBST(REQUIRED_OS_NAME)
AC_SUBST(REQUIRED_OS_VERSION)
--- a/common/bin/compare_exceptions.sh.incl Thu Mar 10 09:50:18 2016 -0800
+++ b/common/bin/compare_exceptions.sh.incl Wed Jul 05 21:26:22 2017 +0200
@@ -185,7 +185,6 @@
./lib/amd64/libjava.so
./lib/amd64/libjawt.so
./lib/amd64/libjdwp.so
- ./lib/amd64/libjfr.so
./lib/amd64/libjpeg.so
./lib/amd64/libjsdt.so
./lib/amd64/libjsound.so
@@ -321,7 +320,6 @@
./lib/sparcv9/libjava.so
./lib/sparcv9/libjawt.so
./lib/sparcv9/libjdwp.so
- ./lib/sparcv9/libjfr.so
./lib/sparcv9/libjpeg.so
./lib/sparcv9/libjsdt.so
./lib/sparcv9/libjsound.so
--- a/common/bin/unshuffle_list.txt Thu Mar 10 09:50:18 2016 -0800
+++ b/common/bin/unshuffle_list.txt Wed Jul 05 21:26:22 2017 +0200
@@ -1293,12 +1293,8 @@
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
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/com/apple/concurrent : jdk/src/macosx/classes/com/apple/concurrent
-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
-jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
+jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
+jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver
jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver
--- a/make/CompileJavaModules.gmk Thu Mar 10 09:50:18 2016 -0800
+++ b/make/CompileJavaModules.gmk Wed Jul 05 21:26:22 2017 +0200
@@ -368,21 +368,7 @@
################################################################################
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
-jdk.hotspot.agent_COPY := .png sa.js .properties
-
-ifeq ($(MODULE), jdk.hotspot.agent)
- ### Copy gif files
- # Special handling to copy gif files in images/toolbarButtonGraphics \
- # -> classes/toolbarButtonGraphics.
- # These can't be handled by COPY to SetupJavaCompilation since they chop off
- # one directory level.
- $(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
- SRC := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images, \
- DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
- FILES := $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images/*/*/*.gif), \
- ))
- jdk.hotspot.agent: $(COPY_SA_IMAGES)
-endif
+jdk.hotspot.agent_COPY := .gif .png sa.js .properties
################################################################################
--- a/make/Images.gmk Thu Mar 10 09:50:18 2016 -0800
+++ b/make/Images.gmk Wed Jul 05 21:26:22 2017 +0200
@@ -62,10 +62,6 @@
PROVIDER_MODULES += jdk.crypto.ucrypto
endif
-ifeq ($(OPENJDK_TARGET_OS), macosx)
- MAIN_MODULES += jdk.deploy.osx
-endif
-
JRE_MODULES := $(filter-out $(MODULES_FILTER), $(MAIN_MODULES) $(PROVIDER_MODULES))
JDK_MODULES := $(filter-out $(MODULES_FILTER), $(JRE_MODULES) $(TOOLS_MODULES))
--- a/make/Main.gmk Thu Mar 10 09:50:18 2016 -0800
+++ b/make/Main.gmk Wed Jul 05 21:26:22 2017 +0200
@@ -413,9 +413,6 @@
# Declare dependencies from all other <module>-lib to java.base-lib
$(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \
$(eval $t: java.base-libs))
- # Declare the special case dependency for jdk.deploy.osx where libosx
- # links against libosxapp.
- jdk.deploy.osx-libs: java.desktop-libs
# jdk.accessibility depends on java.desktop
jdk.accessibility-libs: java.desktop-libs
--- a/make/common/NON_CORE_PKGS.gmk Thu Mar 10 09:50:18 2016 -0800
+++ b/make/common/NON_CORE_PKGS.gmk Wed Jul 05 21:26:22 2017 +0200
@@ -98,8 +98,7 @@
SCTPAPI_PKGS = com.sun.nio.sctp
ifeq ($(PLATFORM), macosx)
- APPLE_EXT_PKGS = com.apple.concurrent \
- com.apple.eawt \
+ APPLE_EXT_PKGS = com.apple.eawt \
com.apple.eawt.event \
com.apple.eio
endif
--- a/make/devkit/createWindowsDevkit.sh Thu Mar 10 09:50:18 2016 -0800
+++ b/make/devkit/createWindowsDevkit.sh Wed Jul 05 21:26:22 2017 +0200
@@ -74,6 +74,10 @@
cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/
cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/amd64/
cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/amd64/
+ # The msvcdis dll is needed to run some of the tools in VC/bin but is not
+ # shipped in that directory. Copy it from the common dir.
+ cp "$VS_INSTALL_DIR/Common7/IDE/msvcdis${VS_VERSION_NUM_NODOT}.dll" \
+ $DEVKIT_ROOT/VC/bin/
fi
################################################################################
--- a/modules.xml Thu Mar 10 09:50:18 2016 -0800
+++ b/modules.xml Wed Jul 05 21:26:22 2017 +0200
@@ -239,6 +239,7 @@
<to>java.xml</to>
<to>jdk.charsets</to>
<to>jdk.management.resource</to>
+ <to>jdk.jfr</to>
<to>jdk.net</to>
<to>jdk.scripting.nashorn</to>
<to>jdk.vm.ci</to>
@@ -250,6 +251,22 @@
<to>jdk.jvmstat</to>
</export>
<export>
+ <name>jdk.internal.org.xml.sax</name>
+ <to>jdk.jfr</to>
+ </export>
+ <export>
+ <name>jdk.internal.org.xml.sax.helpers</name>
+ <to>jdk.jfr</to>
+ </export>
+ <export>
+ <name>jdk.internal.util.xml</name>
+ <to>jdk.jfr</to>
+ </export>
+ <export>
+ <name>jdk.internal.util.xml.impl</name>
+ <to>jdk.jfr</to>
+ </export>
+ <export>
<name>jdk.internal.org.objectweb.asm</name>
<to>java.instrument</to>
<to>jdk.jfr</to>
@@ -300,7 +317,6 @@
<to>java.xml</to>
<to>jdk.charsets</to>
<to>jdk.crypto.pkcs11</to>
- <to>jdk.deploy.osx</to>
<to>jdk.httpserver</to>
<to>jdk.jartool</to>
<to>jdk.jconsole</to>
@@ -314,6 +330,7 @@
<to>jdk.vm.ci</to>
<to>jdk.zipfs</to>
<to>java.instrument</to>
+ <to>jdk.jfr</to>
</export>
<export>
<name>sun.net</name>
@@ -421,7 +438,6 @@
<export>
<name>sun.security.pkcs</name>
<to>jdk.crypto.ec</to>
- <to>jdk.deploy.osx</to>
<to>jdk.jartool</to>
</export>
<export>
@@ -462,7 +478,6 @@
<to>jdk.crypto.mscapi</to>
<to>jdk.crypto.pkcs11</to>
<to>jdk.crypto.ucrypto</to>
- <to>jdk.deploy.osx</to>
<to>jdk.jartool</to>
<to>jdk.policytool</to>
<to>jdk.security.auth</to>
@@ -473,7 +488,6 @@
<to>java.naming</to>
<to>jdk.crypto.ec</to>
<to>jdk.crypto.pkcs11</to>
- <to>jdk.deploy.osx</to>
<to>jdk.jartool</to>
<to>jdk.security.auth</to>
</export>
@@ -926,6 +940,7 @@
<name>sun.management.spi</name>
<to>jdk.management</to>
<to>jdk.management.cmm</to>
+ <to>jdk.management.jfr</to>
</export>
</module>
<module>
@@ -1707,11 +1722,6 @@
<depend>java.base</depend>
</module>
<module>
- <name>jdk.deploy.osx</name>
- <depend>java.base</depend>
- <depend>java.desktop</depend>
- </module>
- <module>
<name>jdk.dev</name>
<depend>java.base</depend>
</module>
--- a/test/lib/sun/hotspot/WhiteBox.java Thu Mar 10 09:50:18 2016 -0800
+++ b/test/lib/sun/hotspot/WhiteBox.java Wed Jul 05 21:26:22 2017 +0200
@@ -119,6 +119,28 @@
return getConstantPool0(aClass);
}
+ private native int getConstantPoolCacheIndexTag0();
+ public int getConstantPoolCacheIndexTag() {
+ return getConstantPoolCacheIndexTag0();
+ }
+
+ private native int getConstantPoolCacheLength0(Class<?> aClass);
+ public int getConstantPoolCacheLength(Class<?> aClass) {
+ Objects.requireNonNull(aClass);
+ return getConstantPoolCacheLength0(aClass);
+ }
+
+ private native int remapInstructionOperandFromCPCache0(Class<?> aClass, int index);
+ public int remapInstructionOperandFromCPCache(Class<?> aClass, int index) {
+ Objects.requireNonNull(aClass);
+ return remapInstructionOperandFromCPCache0(aClass, index);
+ }
+
+ private native int encodeConstantPoolIndyIndex0(int index);
+ public int encodeConstantPoolIndyIndex(int index) {
+ return encodeConstantPoolIndyIndex0(index);
+ }
+
// JVMTI
private native void addToBootstrapClassLoaderSearch0(String segment);
public void addToBootstrapClassLoaderSearch(String segment){
@@ -185,7 +207,7 @@
// Compiler
public native int matchesMethod(Executable method, String pattern);
public native int matchesInline(Executable method, String pattern);
- public native boolean shouldPrintAssembly(Executable method);
+ public native boolean shouldPrintAssembly(Executable method, int comp_level);
public native int deoptimizeFrames(boolean makeNotEntrant);
public native void deoptimizeAll();