OpenJDK / jdk / jdk10
changeset 26871:7a5c3ea38cb6
Merge
| author | amurillo |
|---|---|
| date | Fri, 26 Sep 2014 01:40:33 -0700 |
| parents | a86baa8a39ca 5432207b0d38 |
| children | 443387c64877 a2a52f380463 02d63b3eb16e |
| files | |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/lib/Lib-java.management.gmk Fri Sep 26 12:52:18 2014 +0900 +++ b/jdk/make/lib/Lib-java.management.gmk Fri Sep 26 01:40:33 2014 -0700 @@ -25,9 +25,12 @@ include LibCommon.gmk +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, jdk, lib/Lib-java.management.gmk)) + ################################################################################ -BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \ +BUILD_LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \ $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_API_DIR)/native/libmanagement BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \ $(addprefix -I,$(BUILD_LIBMANAGEMENT_SRC)) \ @@ -56,6 +59,9 @@ endif endif +# Make it possible to override this variable +LIBMANAGEMENT_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers + $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \ LIBRARY := management, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ @@ -64,7 +70,7 @@ LANG := C, \ OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) $(BUILD_LIBMANAGEMENT_CFLAGS), \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \ + MAPFILE := $(LIBMANAGEMENT_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_solaris := -lkstat, \
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java Fri Sep 26 12:52:18 2014 +0900 +++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryTest.java Fri Sep 26 01:40:33 2014 -0700 @@ -59,13 +59,13 @@ // (or equivalent for other collectors) // Number of GC memory managers = 2 - // Hotspot VM 1.8+ after perm gen removal is expected to have two or - // three non-heap memory pools: - // - Code cache + // Hotspot VM 1.8+ after perm gen removal is expected to have between two + // or five non-heap memory pools: + // - Code cache (between one and three depending on the -XX:SegmentedCodeCache option) // - Metaspace // - Compressed Class Space (if compressed class pointers are used) private static int[] expectedMinNumPools = {3, 2}; - private static int[] expectedMaxNumPools = {3, 3}; + private static int[] expectedMaxNumPools = {3, 5}; private static int expectedNumGCMgrs = 2; private static int expectedNumMgrs = expectedNumGCMgrs + 2; private static String[] types = { "heap", "non-heap" };