From e56234c6c882f9326373a18b93e44e7ee0802b4d Mon Sep 17 00:00:00 2001 From: Zoltan Majo Date: Tue, 5 Aug 2014 09:05:51 +0200 Subject: [PATCH 1/3] 8054013: run hotspot JTREG compiler tests only on fastdebug platforms and also on macosx Modify hotspot/make/jprt.properties and make/jprt.properties on the top level to add/remove the relevant platforms. Reviewed-by: kvn, roland --- make/jprt.properties | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/make/jprt.properties b/make/jprt.properties index eed8b41077d..878d881d31a 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -465,15 +465,16 @@ my.make.rule.test.targets.hotspot.internalvmtests= \ windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \ windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests -my.make.rule.test.targets.hotspot.reg.group= \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GROUP, \ - solaris_x64_5.11-{product|fastdebug}-c2-GROUP, \ - linux_i586_2.6-{product|fastdebug}-c2-GROUP, \ - linux_x64_2.6-{product|fastdebug}-c2-GROUP, \ - windows_i586_6.1-{product|fastdebug}-c2-GROUP, \ - windows_x64_6.1-{product|fastdebug}-c2-GROUP, \ - linux_i586_2.6-{product|fastdebug}-c1-GROUP, \ - windows_i586_6.1-{product|fastdebug}-c1-GROUP +my.make.rule.test.targets.hotspot.reg.group= \ + solaris_sparcv9_5.11-fastdebug-c2-GROUP, \ + solaris_x64_5.11-fastdebug-c2-GROUP, \ + linux_i586_2.6-fastdebug-c2-GROUP, \ + linux_x64_2.6-fastdebug-c2-GROUP, \ + macosx_x64_10.7-fastdebug-c2-GROUP, \ + windows_i586_6.1-fastdebug-c2-GROUP, \ + windows_x64_6.1-fastdebug-c2-GROUP, \ + linux_i586_2.6-fastdebug-c1-GROUP, \ + windows_i586_6.1-fastdebug-c1-GROUP my.make.rule.test.targets.hotspot= \ ${my.make.rule.test.targets.hotspot.clienttests}, \ @@ -482,6 +483,6 @@ my.make.rule.test.targets.hotspot= \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ - ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ ${my.additional.make.rule.test.targets.hotspot} From 9570788293092007ec9d2d9d861aaa647ef63877 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Wed, 13 Aug 2014 19:39:05 +0000 Subject: [PATCH 2/3] 8047952: Remove FORTIFY_SOURCE from fastdebug and slowdebug builds Reviewed-by: dholmes --- common/autoconf/flags.m4 | 12 +++++------- common/autoconf/generated-configure.sh | 14 ++++++-------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index 6e9789642aa..5a410820bcd 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -342,17 +342,15 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION], # no adjustment ;; fastdebug ) - # Add compile time bounds checks. - CFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" - CXXFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" + # no adjustment ;; slowdebug ) - # Add runtime bounds checks and symbol info. - CFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all --param ssp-buffer-size=1" - CXXFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all --param ssp-buffer-size=1" + # Add runtime stack smashing and undefined behavior checks + CFLAGS_DEBUG_OPTIONS="-fstack-protector-all --param ssp-buffer-size=1" + CXXFLAGS_DEBUG_OPTIONS="-fstack-protector-all --param ssp-buffer-size=1" if test "x$HAS_CFLAG_DETECT_UNDEFINED_BEHAVIOR" = "xtrue"; then CFLAGS_DEBUG_OPTIONS="$CFLAGS_DEBUG_OPTIONS $CFLAG_DETECT_UNDEFINED_BEHAVIOR_FLAG" - CXXFLAGS_DEBUG_OPTIONS="$CXXFLAGS_DEBUG_OPTIONS $CFLAG_DETECT_UNDEFINED_BEHAVIOR_FLAG" + CXXFLAGS_DEBUG_OPTIONS="$CXXFLAGS_DEBUG_OPTIONS $CFLAG_DETECT_UNDEFINED_BEHAVIsOR_FLAG" fi ;; esac diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 39216b544a6..c4c9cb30bc3 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4311,7 +4311,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1405336663 +DATE_WHEN_GENERATED=1407958623 ############################################################################### # @@ -41946,17 +41946,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; } # no adjustment ;; fastdebug ) - # Add compile time bounds checks. - CFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" - CXXFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1" + # no adjustment ;; slowdebug ) - # Add runtime bounds checks and symbol info. - CFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all --param ssp-buffer-size=1" - CXXFLAGS_DEBUG_OPTIONS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all --param ssp-buffer-size=1" + # Add runtime stack smashing and undefined behavior checks + CFLAGS_DEBUG_OPTIONS="-fstack-protector-all --param ssp-buffer-size=1" + CXXFLAGS_DEBUG_OPTIONS="-fstack-protector-all --param ssp-buffer-size=1" if test "x$HAS_CFLAG_DETECT_UNDEFINED_BEHAVIOR" = "xtrue"; then CFLAGS_DEBUG_OPTIONS="$CFLAGS_DEBUG_OPTIONS $CFLAG_DETECT_UNDEFINED_BEHAVIOR_FLAG" - CXXFLAGS_DEBUG_OPTIONS="$CXXFLAGS_DEBUG_OPTIONS $CFLAG_DETECT_UNDEFINED_BEHAVIOR_FLAG" + CXXFLAGS_DEBUG_OPTIONS="$CXXFLAGS_DEBUG_OPTIONS $CFLAG_DETECT_UNDEFINED_BEHAVIsOR_FLAG" fi ;; esac From 9835d9b9b326c0aaade0b3944c1a379b4b674b1b Mon Sep 17 00:00:00 2001 From: Christian Tornqvist Date: Mon, 18 Aug 2014 14:30:35 -0700 Subject: [PATCH 3/3] 8032999: [TESTBUG] JT-Reg Runtime tests to be run as part of JPRT submit job JPRT will now run most of the tests in /runtime Reviewed-by: dcubed, mseledtsov, zgu, mikael --- make/jprt.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/make/jprt.properties b/make/jprt.properties index eed8b41077d..2938c9aad86 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -483,5 +483,6 @@ my.make.rule.test.targets.hotspot= \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ ${my.additional.make.rule.test.targets.hotspot}