Merge
authordholmes
Thu, 17 Dec 2015 19:54:48 -0500
changeset 35021 5624c943efd2
parent 35020 8a7f717c3bc2 (diff)
parent 35013 fb6550b19018 (current diff)
child 35022 a4827aa736f7
Merge
common/autoconf/generated-configure.sh
--- a/common/autoconf/flags.m4	Thu Dec 17 18:22:30 2015 +0000
+++ b/common/autoconf/flags.m4	Thu Dec 17 19:54:48 2015 -0500
@@ -475,7 +475,7 @@
       C_O_FLAG_HI="-O3 -qstrict"
       C_O_FLAG_NORM="-O2"
       C_O_FLAG_DEBUG="-qnoopt"
-      C_O_FLAG_NONE="-qnoop"
+      C_O_FLAG_NONE="-qnoopt"
     elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
       C_O_FLAG_HIGHEST="-O2"
       C_O_FLAG_HI="-O1"
--- a/common/autoconf/generated-configure.sh	Thu Dec 17 18:22:30 2015 +0000
+++ b/common/autoconf/generated-configure.sh	Thu Dec 17 19:54:48 2015 -0500
@@ -4728,7 +4728,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1450343758
+DATE_WHEN_GENERATED=1450400041
 
 ###############################################################################
 #
@@ -46926,7 +46926,7 @@
       C_O_FLAG_HI="-O3 -qstrict"
       C_O_FLAG_NORM="-O2"
       C_O_FLAG_DEBUG="-qnoopt"
-      C_O_FLAG_NONE="-qnoop"
+      C_O_FLAG_NONE="-qnoopt"
     elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
       C_O_FLAG_HIGHEST="-O2"
       C_O_FLAG_HI="-O1"