Mercurial > hg > jdk9-shenandoah
changeset 1556:9e45c218217e
Merge
author | jwilhelm |
---|---|
date | Mon, 15 Jun 2015 13:48:27 +0200 |
parents | b42f35b0dbff (current diff) 27e6490c4d44 (diff) |
children | 178f65f48dc1 |
files | |
diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/TestFilesCompilation.gmk Thu Jun 11 10:37:11 2015 -0400 +++ b/make/common/TestFilesCompilation.gmk Mon Jun 15 13:48:27 2015 +0200 @@ -86,8 +86,8 @@ OBJECT_DIR := $$($1_OUTPUT_DIR)/support/$$($1_PREFIX)$$(name), \ OUTPUT_DIR := $$($1_OUTPUT_DIR)/$$($1_OUTPUT_SUBDIR), \ LANG := C, \ - CFLAGS := $$($1_CFLAGS), \ - LDFLAGS := $$($1_LDFLAGS), \ + CFLAGS := $$($1_CFLAGS) $$($1_CFLAGS_$$($1_PREFIX)$$(name)), \ + LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$($1_PREFIX)$$(name)), \ OPTIMIZATION := LOW, \ DEBUG_SYMBOLS := true)) \ $$(eval $1 += $$(BUILD_TEST_$$(name)) ) \
--- a/test/lib/sun/hotspot/WhiteBox.java Thu Jun 11 10:37:11 2015 -0400 +++ b/test/lib/sun/hotspot/WhiteBox.java Mon Jun 15 13:48:27 2015 +0200 @@ -306,6 +306,8 @@ public native boolean isConstantVMFlag(String name); public native boolean isLockedVMFlag(String name); public native void setBooleanVMFlag(String name, boolean value); + public native void setIntVMFlag(String name, long value); + public native void setUintVMFlag(String name, long value); public native void setIntxVMFlag(String name, long value); public native void setUintxVMFlag(String name, long value); public native void setUint64VMFlag(String name, long value); @@ -313,6 +315,8 @@ public native void setStringVMFlag(String name, String value); public native void setDoubleVMFlag(String name, double value); public native Boolean getBooleanVMFlag(String name); + public native Long getIntVMFlag(String name); + public native Long getUintVMFlag(String name); public native Long getIntxVMFlag(String name); public native Long getUintxVMFlag(String name); public native Long getUint64VMFlag(String name); @@ -320,9 +324,9 @@ public native String getStringVMFlag(String name); public native Double getDoubleVMFlag(String name); private final List<Function<String,Object>> flagsGetters = Arrays.asList( - this::getBooleanVMFlag, this::getIntxVMFlag, this::getUintxVMFlag, - this::getUint64VMFlag, this::getSizeTVMFlag, this::getStringVMFlag, - this::getDoubleVMFlag); + this::getBooleanVMFlag, this::getIntVMFlag, this::getUintVMFlag, + this::getIntxVMFlag, this::getUintxVMFlag, this::getUint64VMFlag, + this::getSizeTVMFlag, this::getStringVMFlag, this::getDoubleVMFlag); public Object getVMFlag(String name) { return flagsGetters.stream() @@ -359,4 +363,7 @@ // Safepoint Checking public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue); + + // Sharing + public native boolean isShared(Object o); }