# HG changeset patch
# User amurillo
# Date 1408726997 25200
# Node ID e8c2f6d7165372a16dcdc471fe9a57b337109b82
# Parent  40d3b21dbedecb76165bee3c4f36bf7c3e87325c# Parent  ca878f5648a52d19f4e1bb144a1c515cc9e482b5
Merge

diff -r 40d3b21dbede -r e8c2f6d71653 common/autoconf/flags.m4
--- a/common/autoconf/flags.m4	Fri Aug 22 11:51:33 2014 +0200
+++ b/common/autoconf/flags.m4	Fri Aug 22 10:03:17 2014 -0700
@@ -342,17 +342,15 @@
       # 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 -r 40d3b21dbede -r e8c2f6d71653 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Aug 22 11:51:33 2014 +0200
+++ b/common/autoconf/generated-configure.sh	Fri Aug 22 10:03:17 2014 -0700
@@ -4321,7 +4321,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1408448519
+DATE_WHEN_GENERATED=1408660646
 
 ###############################################################################
 #
@@ -42515,17 +42515,15 @@
       # 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 -r 40d3b21dbede -r e8c2f6d71653 make/jprt.properties
--- a/make/jprt.properties	Fri Aug 22 11:51:33 2014 +0200
+++ b/make/jprt.properties	Fri Aug 22 10:03:17 2014 -0700
@@ -466,15 +466,16 @@
   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},				\
@@ -483,6 +484,7 @@
   ${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_runtime_closed},	\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability},	\
   ${my.additional.make.rule.test.targets.hotspot}