Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorjwilhelm
Tue, 09 Jun 2015 16:48:51 +0200
changeset 31313 c9a308b47739
parent 31012 56e7d9f565a3 (current diff)
parent 31221 72b40bd3f4ee (diff)
child 31315 88c66d34131d
Merge
--- a/make/common/TestFilesCompilation.gmk	Thu Jun 04 15:37:59 2015 -0700
+++ b/make/common/TestFilesCompilation.gmk	Tue Jun 09 16:48:51 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 04 15:37:59 2015 -0700
+++ b/test/lib/sun/hotspot/WhiteBox.java	Tue Jun 09 16:48:51 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()
jdk-sandbox