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
authorkvn
Thu, 21 Aug 2014 15:37:51 -0700
changeset 26124 ca878f5648a5
parent 26121 0b88ae5d6f11 (current diff)
parent 26123 44827e1a7a7b (diff)
child 26125 e8c2f6d71653
Merge
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions 
--- a/common/autoconf/flags.m4	Wed Aug 20 17:05:59 2014 -0700
+++ b/common/autoconf/flags.m4	Thu Aug 21 15:37:51 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
--- a/common/autoconf/generated-configure.sh	Wed Aug 20 17:05:59 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Aug 21 15:37:51 2014 -0700
@@ -4311,7 +4311,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1405336663
+DATE_WHEN_GENERATED=1408660646
 
 ###############################################################################
 #
@@ -41946,17 +41946,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
--- a/make/jprt.properties	Wed Aug 20 17:05:59 2014 -0700
+++ b/make/jprt.properties	Thu Aug 21 15:37:51 2014 -0700
@@ -465,15 +465,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},				\
@@ -482,7 +483,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}
jdk-sandbox