From 32e75ce8e47fadf9a43340690e99aa63f900c837 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 15 Aug 2007 21:25:06 +0000 Subject: [PATCH] 'decent' CFLAGS should not feature -O3. Bug 188619 (branches/2.1.2 r7608) svn path=/main/branches/2.1.2.9/; revision=7621 --- cnf/make.conf.alpha.diff | 4 ++-- cnf/make.conf.ppc.diff | 2 +- cnf/make.conf.sparc.diff | 4 ++-- cnf/make.conf.x86-fbsd.diff | 21 ++++++++++----------- cnf/make.conf.x86.diff | 4 ++-- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cnf/make.conf.alpha.diff b/cnf/make.conf.alpha.diff index 5fa4ae30b..f0a4e3852 100644 --- a/cnf/make.conf.alpha.diff +++ b/cnf/make.conf.alpha.diff @@ -33,8 +33,8 @@ # +# Decent examples: +# -+#CFLAGS="-mcpu=ev67 -O3 -pipe " -+CFLAGS="-mcpu=ev5 -O3 -pipe " ++#CFLAGS="-mcpu=ev67 -O2 -pipe " ++CFLAGS="-mcpu=ev5 -O2 -pipe " + # If you set a CFLAGS above, then this line will set your default C++ flags to # the same settings. diff --git a/cnf/make.conf.ppc.diff b/cnf/make.conf.ppc.diff index f01a2da3c..76a97d3c2 100644 --- a/cnf/make.conf.ppc.diff +++ b/cnf/make.conf.ppc.diff @@ -55,7 +55,7 @@ +# all G3 and pre machines. (note it will not hurt pre G3 machines either to +# use this mcpu option as it is the default for gcc 3.2.x anyway) +# -+#CFLAGS="-O3 -pipe -mcpu=G3 -fno-strict-aliasing" ++#CFLAGS="-O2 -pipe -mcpu=G3 -fno-strict-aliasing" + +# Recommended settings for GCC 2.95.3 only (Gentoo 1.2 or older): +# diff --git a/cnf/make.conf.sparc.diff b/cnf/make.conf.sparc.diff index 68c442829..e73357b08 100644 --- a/cnf/make.conf.sparc.diff +++ b/cnf/make.conf.sparc.diff @@ -48,8 +48,8 @@ +# +# Decent examples: +# -+#CFLAGS="-mcpu=supersparc -O3 -pipe" -+#CFLAGS="-mcpu=ultrasparc -O3 -pipe" ++#CFLAGS="-mcpu=supersparc -O2 -pipe" ++#CFLAGS="-mcpu=ultrasparc -O2 -pipe" +#CFLAGS="-mcpu=v8 -mtune=v9 -O2 -pipe" + # If you set a CFLAGS above, then this line will set your default C++ flags to diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff index 787bc3526..95eeea352 100644 --- a/cnf/make.conf.x86-fbsd.diff +++ b/cnf/make.conf.x86-fbsd.diff @@ -17,15 +17,14 @@ # Host and optimization settings # ============================== # -@@ -33,10 +43,34 @@ +@@ -33,10 +42,34 @@ # package (and in some cases the libraries it uses) at default optimizations # before reporting errors to developers. # -# Please refer to the GCC manual for a list of possible values. +# -mtune= means optimize code for the particular type of CPU without +# breaking compatibility with other CPUs. - # --#CFLAGS="-O2 -pipe" ++# +# -march= means to take full advantage of the ABI and instructions +# for the particular CPU; this will break compatibility with older CPUs (for +# example, -march=athlon-xp code will not run on a regular Athlon, and @@ -46,15 +45,16 @@ +# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. # +# ************************************************************************* # # +-#CFLAGS="-O2 -pipe" +# Decent examples: -+# -+#CFLAGS="-mtune=athlon-xp -O3 -pipe" -+#CFLAGS="-march=pentium3 -O3 -pipe" + # ++#CFLAGS="-mtune=athlon-xp -O2 -pipe" ++#CFLAGS="-march=pentium3 -O2 -pipe" + # If you set a CFLAGS above, then this line will set your default C++ flags to # the same settings. #CXXFLAGS="${CFLAGS}" -@@ -61,7 +95,7 @@ +@@ -61,7 +80,7 @@ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST. # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS. # @@ -63,13 +63,12 @@ # Portage Directories # =================== -@@ -279,7 +313,8 @@ +@@ -268,7 +289,8 @@ # 'notitles' disables xterm titlebar updates (which contain status info). # 'parallel-fetch' # do fetching in parallel to compilation -# 'sandbox' enables sandboxing when running emerge and ebuild. +# 'sandbox' enables sandboxing when running emerge and ebuild. Doesn't +# work on *BSD-based systems. - # 'splitdebug' Prior to stripping ELF etdyn and etexec files, the debugging - # info is stored for later use by various debuggers. This - # feature is disabled by 'nostrip'. For installation of source + # 'strict' causes portage to react strongly to conditions that are + # potentially dangerous, like missing/incorrect Manifest files. diff --git a/cnf/make.conf.x86.diff b/cnf/make.conf.x86.diff index 04e48b61e..3e9594abb 100644 --- a/cnf/make.conf.x86.diff +++ b/cnf/make.conf.x86.diff @@ -79,8 +79,8 @@ +# NOTE: the -On optimization levels are set with the letter O, not -0 (zero). +# +# Decent examples: -+#CFLAGS="-mcpu=athlon-xp -O3 -pipe" -+#CFLAGS="-march=pentium3 -O3 -pipe" ++#CFLAGS="-mcpu=athlon-xp -O2 -pipe" ++#CFLAGS="-march=pentium3 -O2 -pipe" + # If you set a CFLAGS above, then this line will set your default C++ flags to # the same settings. -- 2.26.2