Mercurial > hg > jdk9-shenandoah
changeset 1543:c706ef5ea5da jdk9-b71
Merge
| author | lana |
|---|---|
| date | Sun, 28 Jun 2015 16:38:02 -0700 |
| parents | 6d1e100d3687 (current diff) 2f143b1e68d5 (diff) |
| children | 0906b79c9df4 f9fed16fe0ef |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/MakeBase.gmk Thu Jun 25 10:21:33 2015 -0700 +++ b/make/common/MakeBase.gmk Sun Jun 28 16:38:02 2015 -0700 @@ -369,8 +369,9 @@ HGTIP_FILENAME=.hgtip HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \ - $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \ - $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \ + $(shell $(CD) $(SRC_ROOT) ; \ + $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) \ + $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) \ 2> /dev/null))))) # Emit the repo:tip pairs to $@
--- a/make/common/TestFilesCompilation.gmk Thu Jun 25 10:21:33 2015 -0700 +++ b/make/common/TestFilesCompilation.gmk Sun Jun 28 16:38:02 2015 -0700 @@ -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 25 10:21:33 2015 -0700 +++ b/test/lib/sun/hotspot/WhiteBox.java Sun Jun 28 16:38:02 2015 -0700 @@ -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()