You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/10/04 23:11:50 UTC
svn commit: r1178953 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES
STATUS configure.ac
Author: igalic
Date: Tue Oct 4 21:11:50 2011
New Revision: 1178953
URL: http://svn.apache.org/viewvc?rev=1178953&view=rev
Log:
Backport for TS-967: Allow for our default -O3 options to be overriden via CFLAGS/CXXFLAGS
Author: Arno Toell, igalic
Submitter: igalic
Reviewer: igalic, jim, zwoop
Backporter: Igalic
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/CHANGES
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/configure.ac
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 4 21:11:50 2011
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1155125,1171365
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1155125,1171365,1175914
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1178953&r1=1178952&r2=1178953&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Tue Oct 4 21:11:50 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.2
+ *) [TS-967]: Allow for our default -O3 options to be overriden via CFLAGS/CXXFLAGS
+ Author: Arno Toell and igalic
+
*) [TS-969] tests failing on some Debian sid and Solaris
*) [TS-867] PluginVC crashes with TSFetchURL
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1178953&r1=1178952&r2=1178953&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Tue Oct 4 21:11:50 2011
@@ -38,11 +38,6 @@ A list of all bugs open for the next v3.
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
- *) Build: Allow for our default -O3 options to be overriden via CFLAGS/CXXFLAGS
- Trunk patches: http://svn.apache.org/viewvc?rev=1175914&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-967
- +1: igalic, jim, zwoop
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: trafficserver/traffic/branches/3.0.x/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/configure.ac?rev=1178953&r1=1178952&r2=1178953&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/configure.ac (original)
+++ trafficserver/traffic/branches/3.0.x/configure.ac Tue Oct 4 21:11:50 2011
@@ -485,6 +485,17 @@ AC_ARG_VAR([PERL], [full path of Perl ex
CFLAGS="${REAL_CFLAGS}"
CXXFLAGS="${REAL_CXXFLAGS}"
+AC_MSG_CHECKING([checking whether to auto-set compile optimizing flags])
+has_optimizer_flags=`$as_echo "$CFLAGS $CXXFLAGS" | ${AWK} '/-x?O.?/{print "no"}'`
+AS_IF([test "x${has_optimizer_flags}" = "xno"],
+ [ optimizing_flags='' ],
+ [
+ has_optimizer_flags='yes'
+ optimizing_flags='-O3'
+ ]
+)
+AC_MSG_RESULT([${has_optimizer_flags} ${optimizing_flags}])
+
base_cc=`basename $CC`
# These are shortcuts used in combination for the compiler options below
case $host_os in
@@ -509,21 +520,21 @@ case $host_os in
# TODO: We should try to eliminate more of these -wd exclusions.
common_opt="-pipe -Wall -wd111 -wd279 -wd383 -wd522 -wd444 -wd873 -wd981 -wd1418 -wd1419 -wd1572 -wd1720 -wd2256 -wd2259"
debug_opt="-ggdb3 $common_opt"
- release_opt="-g $common_opt -O2 -axsse4.2 -fno-strict-aliasing"
+ release_opt="-g $common_opt $optimization_flags -axsse4.2 -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
else # gcc
# This is useful for finding odd conversions
# common_opt="-pipe -Wall -Werror -Wconversion -Wno-sign-conversion"
common_opt="-pipe -Wall -Werror"
debug_opt="-ggdb3 $common_opt"
- release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
+ release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
fi
;;
darwin*)
common_opt="-pipe -Wall -Werror"
debug_opt="-ggdb3 $common_opt"
- release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
+ release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
TS_ADDTO(CPPFLAGS, [-I/opt/local/include])
TS_ADDTO(LDFLAGS, [-L/opt/local/lib])
@@ -531,7 +542,7 @@ case $host_os in
freebsd*|kfreebsd*)
common_opt="-pipe -Wall -Werror"
debug_opt="-ggdb3 $common_opt"
- release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
+ release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
TS_ADDTO(LDFLAGS, [-L/usr/local/lib])
;;
@@ -539,7 +550,7 @@ case $host_os in
if test "x${base_cc}" = "xcc"; then
common_opt="-mt -m64 -D__WORDSIZE=64" # FIXME: arch should be detected
debug_opt="-g $common_opt"
- release_opt="-g $common_opt -xO3"
+ release_opt="-g $common_opt $optimizing_flags"
cxx_opt="-library=stlport4"
cxx_dbg="+w2"
cxx_rel="-erroff"
@@ -552,7 +563,7 @@ case $host_os in
else # gcc
common_opt="-pipe -Wall -Werror"
debug_opt="-ggdb3 $common_opt"
- release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
+ release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
fi
TS_ADDTO(LDFLAGS, [-L/lib])
@@ -561,7 +572,7 @@ case $host_os in
*)
common_opt="-pipe -Wall -Werror"
debug_opt="-ggdb3 $common_opt"
- release_opt="-g $common_opt -O3 -feliminate-unused-debug-symbols -fno-strict-aliasing"
+ release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
cxx_opt="-Wno-invalid-offsetof"
;;
esac