Mercurial > hg > jdk9-shenandoah
changeset 1552:c8b4333cb501
Merge
| author | prr |
|---|---|
| date | Tue, 30 Jun 2015 08:51:34 -0700 |
| parents | 908ccef3834c (current diff) 767a64493b62 (diff) |
| children | 32f6be9541fa |
| files | make/StripBinaries.gmk make/common/MakeBase.gmk |
| diffstat | 6 files changed, 21 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 22 13:29:34 2015 -0700 +++ b/.hgtags Tue Jun 30 08:51:34 2015 -0700 @@ -312,3 +312,4 @@ f546760134eb861fcfecd4ce611b0040b0d25a6a jdk9-b67 70e4272790b6199e9ca89df2758ff9cb58ec4125 jdk9-b68 1bcfd6b8726582cff5a42dbfc75903e36f9dd4fe jdk9-b69 +eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70
--- a/make/StripBinaries.gmk Mon Jun 22 13:29:34 2015 -0700 +++ b/make/StripBinaries.gmk Tue Jun 30 08:51:34 2015 -0700 @@ -62,16 +62,16 @@ COPY_CMDS_SRC := $(filter $(NO_STRIP_CMDS_FILTER), $(ALL_CMDS_SRC)) STRIP_CMDS_SRC := $(filter-out $(NO_STRIP_CMDS_FILTER), $(ALL_CMDS_SRC)) -# Make sure symbolic links are copied and not stripped -COPY_LIBS_SRC := \ - $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs \ - \( ! -name '*$(SHARED_LIBRARY_SUFFIX)' -type f \) -o -type l) # OS X stores symbol information in a .dylib file inside a .dSYM directory - # that file should not be stripped, so we prune the tree at the .dSYM directory. # Example: support/modules_libs/java.base/libjsig.dylib.dSYM/Contents/Resources/DWARF/libjsig.dylib STRIP_LIBS_SRC := \ $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs \ -name '*$(SHARED_LIBRARY_SUFFIX)' -type f -print -o -name "*.dSYM" -prune) +# Make sure symbolic links are copied and not stripped. +COPY_LIBS_SRC := \ + $(filter-out $(STRIP_LIBS_SRC), \ + $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs -type f -o -type l)) $(eval $(call SetupCopyFiles,STRIP_MODULES_CMDS, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds, \
--- a/make/common/MakeBase.gmk Mon Jun 22 13:29:34 2015 -0700 +++ b/make/common/MakeBase.gmk Tue Jun 30 08:51:34 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 Mon Jun 22 13:29:34 2015 -0700 +++ b/make/common/TestFilesCompilation.gmk Tue Jun 30 08:51:34 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/make/jprt.properties Mon Jun 22 13:29:34 2015 -0700 +++ b/make/jprt.properties Tue Jun 30 08:51:34 2015 -0700 @@ -123,11 +123,11 @@ ${my.i586.default.build.configure.args} \ ${jprt.productOpen.build.configure.args} -jprt.windows_i586_6.2.build.configure.args= \ - --with-toolchain-version=2013 \ +jprt.windows_i586.build.configure.args= \ + --with-devkit=$VS2013_HOME \ ${jprt.i586.build.configure.args} -jprt.windows_x64_6.2.build.configure.args= \ - --with-toolchain-version=2013 +jprt.windows_x64.build.configure.args= \ + --with-devkit=$VS2013_HOME ######## #
--- a/test/lib/sun/hotspot/WhiteBox.java Mon Jun 22 13:29:34 2015 -0700 +++ b/test/lib/sun/hotspot/WhiteBox.java Tue Jun 30 08:51:34 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()