Added -pipe to default CFLAGS/CXXFLAGS and doing some minor cleanup (comments mostly).

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1008 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index de0c15fbd37b1612d8dc7027452b6651fe04fd42..06f2c8cca3d5544a5405d808fee78e2bc1a399ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.495 2006/01/03 14:25:08 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.496 2006/01/03 14:55:11 wolf31o2 Exp $
+
+  03 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/alpha.py,
+  arch/amd64.py, arch/mips.py, arch/ppc.py, arch/ppc64.py, arch/s390.py,
+  arch/sh.py, arch/sparc.py, arch/sparc64.py, arch/x86.py:
+  Added -pipe to default CFLAGS/CXXFLAGS and doing some minor cleanup
+  (comments mostly).
 
   03 Jan 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/arch/alpha.py b/arch/alpha.py
index 521aaa7c15e316364d290c2ea57379e90cd28d0f..4dbf0e58180a8ee26d1729f28e17034db2efe0ee 100644 (file)
--- a/arch/alpha.py
+++ b/arch/alpha.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/alpha.py,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/alpha.py,v 1.4 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -11,7 +11,7 @@ class generic_alpha(builder.generic):
                builder.generic.__init__(self,myspec)
                self.settings["mainarch"]="alpha"
                self.settings["CHROOT"]="chroot"
-               self.settings["CFLAGS"]="-mieee"
+               self.settings["CFLAGS"]="-mieee -pipe"
 
 class arch_alpha(generic_alpha):
        "builder class for generic alpha (ev4+)"

diff --git a/arch/amd64.py b/arch/amd64.py
index e960760f2f01f77ce59a78da4f4ed0d29cc01cfd..724b291c17d9526b52ca8bcfb58fb2f6f0f9db05 100644 (file)
--- a/arch/amd64.py
+++ b/arch/amd64.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/amd64.py,v 1.4 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/amd64.py,v 1.5 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder
 
@@ -15,10 +15,10 @@ class arch_amd64(generic_amd64):
        "builder class for generic amd64 (athlon64/opteron)"
        def __init__(self,myspec):
                generic_amd64.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2"
+               self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="x86_64-pc-linux-gnu"
 
 def register(foo):
        "Inform main catalyst program of the contents of this plugin."
        foo.update({"amd64":arch_amd64})
-               
+

diff --git a/arch/mips.py b/arch/mips.py
index 5e7666de8b1fed688ecc70973433453484bdc359..c2684bdd97cef9de3e0cd88c6f723cd302501a0c 100644 (file)
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/mips.py,v 1.5 2005/07/06 18:50:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/mips.py,v 1.6 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -25,56 +25,56 @@ class arch_mips1(generic_mips):
        "Builder class for MIPS I [Big-endian]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips1 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -pipe"
 
 class arch_mips2(generic_mips):
        "Builder class for MIPS II [Big-endian]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips2 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips2 -mabi=32 -pipe"
 
 class arch_mips3(generic_mips):
        "Builder class for MIPS III [Big-endian]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips3 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe"
 
 class arch_mips4(generic_mips):
        "Builder class for MIPS IV [Big-endian]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips4 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe"
 
 class arch_mips4n32(generic_mips):
        "Builder class for MIPS IV [Big-endian N32]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32"
+               self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
                self.settings["CHOST"]="mips64-unknown-linux-gnu"
 
 class arch_mipsel1(generic_mipsel):
        "Builder class for all MIPS I [Little-endian]"
        def __init__(self,myspec):
                generic_mipsel.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips1 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -pipe"
 
 class arch_mipsel2(generic_mipsel):
        "Builder class for all MIPS II [Little-endian]"
        def __init__(self,myspec):
                generic_mipsel.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips2 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips2 -mabi=32 -pipe"
 
 class arch_mipsel3(generic_mipsel):
        "Builder class for all MIPS III [Little-endian]"
        def __init__(self,myspec):
                generic_mipsel.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips3 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe"
 
 class arch_mipsel4(generic_mipsel):
        "Builder class for all MIPS IV [Little-endian]"
        def __init__(self,myspec):
                generic_mipsel.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mips4 -mabi=32"
+               self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe"
 
 
 

diff --git a/arch/ppc.py b/arch/ppc.py
index e540f4ff869597de1de8d7509656c4ce03eceed2..f4c0a9fbd85f6dcd02131023a2d6ea126027461d 100644 (file)
--- a/arch/ppc.py
+++ b/arch/ppc.py
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/ppc.py,v 1.15 2005/11/30 21:34:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/ppc.py,v 1.16 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import os,builder
 from catalyst_support import *
 
-# gcc-3.3.3 required to do G5 optimizations
-# install a 32bit kernel personality changer (that works) before building on a ppc64 host
-# new gcc optimization feature requires -fno-strict-aliasing needed, otherwise code complains 
-# use the experimental thing for nptl builds
+# gcc-3.3.3 is required to do G5 optimizations
+# install a 32bit kernel personality changer (that works) before building on a
+# ppc64 host new gcc optimization feature requires -fno-strict-aliasing needed,
+# otherwise code complains use the experimental thing for nptl builds
 
 class generic_ppc(builder.generic):
        "abstract base class for all ppc builders"

diff --git a/arch/ppc64.py b/arch/ppc64.py
index bd944ba763d181aeaf40514421b818eb125cc011..562ec21af70e5df322af20935892760656b89844 100644 (file)
--- a/arch/ppc64.py
+++ b/arch/ppc64.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/ppc64.py,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/ppc64.py,v 1.4 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder
 
@@ -15,10 +15,10 @@ class arch_ppc64(generic_ppc64):
        "builder class for generic ppc64 (G5/Power4/Power4+)"
        def __init__(self,myspec):
                generic_ppc64.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2"
+               self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="powerpc64-unknown-linux-gnu"
 
 def register(foo):
        "Inform main catalyst program of the contents of this plugin."
        foo.update({"ppc64":arch_ppc64})
-               
+

diff --git a/arch/s390.py b/arch/s390.py
index 2e526f667aaac0e33a6e1bd9654d3d43df5d7a77..c9294e2dd14f3a8a374f079dbf59ab0c2bbbc62b 100644 (file)
--- a/arch/s390.py
+++ b/arch/s390.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/s390.py,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/s390.py,v 1.4 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -16,7 +16,7 @@ class arch_s390(generic_s390):
        "builder class for generic s390"
        def __init__(self,myspec):
                generic_s390.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2"
+               self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="s390-ibm-linux-gnu"
 
 def register(foo):

diff --git a/arch/sh.py b/arch/sh.py
index 90746182c614f96518784b79c23f74f8e9eb984f..a964e8f50ebca5d0610ee5a8ffd161c22f59c0f4 100644 (file)
--- a/arch/sh.py
+++ b/arch/sh.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sh.py,v 1.3 2005/12/23 06:38:18 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sh.py,v 1.4 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -23,56 +23,56 @@ class arch_sh(generic_sh):
        "Builder class for SH [Little-endian]"
        def __init__(self,myspec):
                generic_sh.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2"
+               self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="sh-unknown-linux-gnu"
 
 class arch_sh2(generic_sh):
        "Builder class for SH-2 [Little-endian]"
        def __init__(self,myspec):
                generic_sh.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -m2"
+               self.settings["CFLAGS"]="-O2 -m2 -pipe"
                self.settings["CHOST"]="sh2-unknown-linux-gnu"
 
 class arch_sh3(generic_sh):
        "Builder class for SH-3 [Little-endian]"
        def __init__(self,myspec):
                generic_sh.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -m3"
+               self.settings["CFLAGS"]="-O2 -m3 -pipe"
                self.settings["CHOST"]="sh3-unknown-linux-gnu"
 
 class arch_sh4(generic_sh):
        "Builder class for SH-4 [Little-endian]"
        def __init__(self,myspec):
                generic_sh.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -m4"
+               self.settings["CFLAGS"]="-O2 -m4 -pipe"
                self.settings["CHOST"]="sh4-unknown-linux-gnu"
 
 class arch_sheb(generic_sheb):
        "Builder class for SH [Big-endian]"
        def __init__(self,myspec):
                generic_sheb.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2"
+               self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="sheb-unknown-linux-gnu"
 
 class arch_sh2eb(generic_sheb):
        "Builder class for SH-2 [Big-endian]"
        def __init__(self,myspec):
                generic_sheb.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -m2"
+               self.settings["CFLAGS"]="-O2 -m2 -pipe"
                self.settings["CHOST"]="sh2eb-unknown-linux-gnu"
 
 class arch_sh3eb(generic_sheb):
        "Builder class for SH-3 [Big-endian]"
        def __init__(self,myspec):
                generic_sheb.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -m3"
+               self.settings["CFLAGS"]="-O2 -m3 -pipe"
                self.settings["CHOST"]="sh3eb-unknown-linux-gnu"
 
 class arch_sh4eb(generic_sheb):
        "Builder class for SH-4 [Big-endian]"
        def __init__(self,myspec):
                generic_sheb.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -m4"
+               self.settings["CFLAGS"]="-O2 -m4 -pipe"
                self.settings["CHOST"]="sh4eb-unknown-linux-gnu"
 
 def register(foo):

diff --git a/arch/sparc.py b/arch/sparc.py
index aff44b9e183193b636590861d0391d8e679e3e31..71f5eb7532fec64dcf07b47bce53422c1989c5e7 100644 (file)
--- a/arch/sparc.py
+++ b/arch/sparc.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sparc.py,v 1.6 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sparc.py,v 1.7 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -21,8 +21,8 @@ class arch_sparc(generic_sparc):
        "builder class for generic sparc (sun4cdm)"
        def __init__(self,myspec):
                generic_sparc.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2"
-               self.settings["CXXFLAGS"]="-O2"
+               self.settings["CFLAGS"]="-O2 -pipe"
+               self.settings["CXXFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="sparc-unknown-linux-gnu"
 
 def register(foo):

diff --git a/arch/sparc64.py b/arch/sparc64.py
index 590e35c48fd5aea894b3eeb0559b6d1b0abb35a5..6b4e0353c4d121a92966ffb51cfee6d08385c82f 100644 (file)
--- a/arch/sparc64.py
+++ b/arch/sparc64.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sparc64.py,v 1.5 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sparc64.py,v 1.6 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -16,8 +16,8 @@ class arch_sparc64(generic_sparc64):
        "builder class for generic sparc64 (sun4u)"
        def __init__(self,myspec):
                generic_sparc64.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc"
-               self.settings["CXXFLAGS"]="-O2 -mcpu=ultrasparc"
+               self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc -pipe"
+               self.settings["CXXFLAGS"]="-O2 -mcpu=ultrasparc -pipe"
                self.settings["CHOST"]="sparc-unknown-linux-gnu"
 
 def register(foo):

diff --git a/arch/x86.py b/arch/x86.py
index 6ac90b8493f6073477d762f7301f9d661e6fbb8e..bc9ab508c15ac26d2b3f747fbb89dfa85b6fa466 100644 (file)
--- a/arch/x86.py
+++ b/arch/x86.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/arch/x86.py,v 1.21 2005/12/16 18:57:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/x86.py,v 1.22 2006/01/03 14:55:11 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -21,43 +21,43 @@ class arch_x86(generic_x86):
        "builder class for generic x86 (386+)"
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -mcpu=i686"
+               self.settings["CFLAGS"]="-O2 -mcpu=i686 -pipe"
                self.settings["CHOST"]="i386-pc-linux-gnu"
 
 class arch_i386(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=i386"
+               self.settings["CFLAGS"]="-O2 -march=i386 -pipe"
                self.settings["CHOST"]="i386-pc-linux-gnu"
 
 class arch_i486(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=i486"
+               self.settings["CFLAGS"]="-O2 -march=i486 -pipe"
                self.settings["CHOST"]="i486-pc-linux-gnu"
 
 class arch_i586(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=i586"
+               self.settings["CFLAGS"]="-O2 -march=i586 -pipe"
                self.settings["CHOST"]="i586-pc-linux-gnu"
 
 class arch_pentium_mmx(arch_i586):
        def __init__(self,myspec):
                arch_i586.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=pentium-mmx"
+               self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe"
                self.settings["HOSTUSE"]=["mmx"]
        
 class arch_i686(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=i686"
+               self.settings["CFLAGS"]="-O2 -march=i686 -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
 
 class arch_athlon(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=athlon"
+               self.settings["CFLAGS"]="-O2 -march=athlon -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","3dnow"]
 
@@ -65,21 +65,21 @@ class arch_athlon_xp(generic_x86):
        #this handles XP and MP processors
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=athlon-xp"
+               self.settings["CFLAGS"]="-O2 -march=athlon-xp -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","3dnow","sse"]
 
 class arch_pentium4(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=pentium4"
+               self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","sse"]
 
 class arch_pentium3(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=pentium3"
+               self.settings["CFLAGS"]="-O2 -march=pentium3 -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","sse"]