--- a/common/autoconf/generated-configure.sh Tue Sep 15 18:00:21 2015 +0200
+++ b/common/autoconf/generated-configure.sh Tue Sep 15 11:47:50 2015 -0700
@@ -841,7 +841,6 @@
JDK_MAJOR_VERSION
USER_RELEASE_SUFFIX
COMPRESS_JARS
-RMICONNECTOR_IIOP
UNLIMITED_CRYPTO
CACERTS_FILE
TEST_IN_BUILD
@@ -1060,7 +1059,6 @@
enable_hotspot_test_in_build
with_cacerts_file
enable_unlimited_crypto
-enable_rmiconnector_iiop
with_milestone
with_update_version
with_user_release_suffix
@@ -1848,9 +1846,6 @@
run the Queens test after Hotspot build [disabled]
--enable-unlimited-crypto
Enable unlimited crypto policy [disabled]
- --enable-rmiconnector-iiop
- enable the JMX RMIConnector iiop transport
- [disabled]
--disable-warnings-as-errors
do not consider native warnings to be an error
[enabled]
@@ -3951,7 +3946,7 @@
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -20100,22 +20095,6 @@
###############################################################################
#
- # --enable-rmiconnector-iiop
- #
- # Check whether --enable-rmiconnector-iiop was given.
-if test "${enable_rmiconnector_iiop+set}" = set; then :
- enableval=$enable_rmiconnector_iiop;
-fi
-
- if test "x$enable_rmiconnector_iiop" = "xyes"; then
- RMICONNECTOR_IIOP=true
- else
- RMICONNECTOR_IIOP=false
- fi
-
-
- ###############################################################################
- #
# Compress jars
#
COMPRESS_JARS=false
--- a/common/autoconf/jdk-options.m4 Tue Sep 15 18:00:21 2015 +0200
+++ b/common/autoconf/jdk-options.m4 Tue Sep 15 11:47:50 2015 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -455,19 +455,6 @@
###############################################################################
#
- # --enable-rmiconnector-iiop
- #
- AC_ARG_ENABLE(rmiconnector-iiop, [AS_HELP_STRING([--enable-rmiconnector-iiop],
- [enable the JMX RMIConnector iiop transport @<:@disabled@:>@])])
- if test "x$enable_rmiconnector_iiop" = "xyes"; then
- RMICONNECTOR_IIOP=true
- else
- RMICONNECTOR_IIOP=false
- fi
- AC_SUBST(RMICONNECTOR_IIOP)
-
- ###############################################################################
- #
# Compress jars
#
COMPRESS_JARS=false
--- a/common/autoconf/spec.gmk.in Tue Sep 15 18:00:21 2015 +0200
+++ b/common/autoconf/spec.gmk.in Tue Sep 15 11:47:50 2015 -0700
@@ -262,9 +262,6 @@
# Enable unlimited crypto policy
UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
-# Enable RMIConnector IIOP transport
-RMICONNECTOR_IIOP=@RMICONNECTOR_IIOP@
-
GCOV_ENABLED=@GCOV_ENABLED@
# Necessary additional compiler flags to compile X11
--- a/make/CompileJavaModules.gmk Tue Sep 15 18:00:21 2015 +0200
+++ b/make/CompileJavaModules.gmk Tue Sep 15 11:47:50 2015 -0700
@@ -275,13 +275,6 @@
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
################################################################################
-# Exclude building of IIOP transport for RMI Connector
-
-ifeq ($(RMICONNECTOR_IIOP), false)
- java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop
-endif
-
-################################################################################
java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
java.rmi_CLEAN_FILES := $(wildcard \
--- a/test/lib/sun/hotspot/WhiteBox.java Tue Sep 15 18:00:21 2015 +0200
+++ b/test/lib/sun/hotspot/WhiteBox.java Tue Sep 15 11:47:50 2015 -0700
@@ -26,12 +26,10 @@
import java.lang.management.MemoryUsage;
import java.lang.reflect.Executable;
-import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Function;
-import java.util.stream.Stream;
import java.security.BasicPermission;
import java.util.Objects;
@@ -85,6 +83,7 @@
public native int getVMPageSize();
public native long getVMAllocationGranularity();
public native long getVMLargePageSize();
+ public native long getHeapSpaceAlignment();
private native boolean isObjectInOldGen0(Object o);
public boolean isObjectInOldGen(Object o) {
@@ -144,6 +143,10 @@
return parseCommandLine0(commandline, delim, args);
}
+ // Parallel GC
+ public native long psVirtualSpaceAlignment();
+ public native long psHeapGenerationAlignment();
+
// NMT
public native long NMTMalloc(long size);
public native void NMTFree(long mem);
@@ -386,23 +389,6 @@
.orElse(null);
}
- public native boolean readImageFile(String imagePath);
- public native long imageOpenImage(String imagePath, boolean bigEndian);
- public native void imageCloseImage(long id);
- public native long imageGetIndexAddress(long id);
- public native long imageGetDataAddress(long id);
- public native boolean imageReadCompressed(long id, long offset,
- ByteBuffer compressedBuffer, long compressedSize,
- ByteBuffer uncompressedBuffer, long uncompressedSize);
- public native boolean imageRead(long id, long offset,
- ByteBuffer uncompressedBuffer, long uncompressedSize);
- public native byte[] imageGetStringBytes(long id, int offset);
- public native long imageGetStringsSize(long id);
- public native long[] imageGetAttributes(long id, int offset);
- public native long[] imageFindAttributes(long id, byte[] path);
- public native int[] imageAttributeOffsets(long id);
- public native int imageGetIntAtAddress(long address, int offset, boolean big_endian);
-
// Safepoint Checking
public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue);