From 995e80befa1e93ae7d9a3155993336e9e2336c4f Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 3 Jun 2015 11:03:06 +0200 Subject: [PATCH 1/2] 8081471: Allow SetupTestFilesCompilation to set LDFLAGS for individual tests Reviewed-by: erikj --- make/common/TestFilesCompilation.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk index 8be3d72e961..c2e9c56f051 100644 --- a/make/common/TestFilesCompilation.gmk +++ b/make/common/TestFilesCompilation.gmk @@ -86,8 +86,8 @@ define SetupTestFilesCompilationBody 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)) ) \ From d4b084e6b04804e975907968bac92dcc334cc16b Mon Sep 17 00:00:00 2001 From: David Lindholm Date: Thu, 4 Jun 2015 14:39:07 +0200 Subject: [PATCH 2/2] 8080947: Add uint as a valid VM flag type Reviewed-by: brutisso, ddmitriev --- test/lib/sun/hotspot/WhiteBox.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index 2b4135dff96..2cd3d670295 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -306,6 +306,8 @@ public class WhiteBox { 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 class WhiteBox { 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 class WhiteBox { public native String getStringVMFlag(String name); public native Double getDoubleVMFlag(String name); private final List> 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()