From c7259bfc91e1fd5c9db642e59d13dd5b835517cd Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Fri, 13 May 2011 13:34:23 +0000
Subject: Add specialization for i486 that uses -mtune=generic, as Debian
 invokes the build with --cpu=i486 on x86-32.

Add -momit-leaf-frame-pointer to x86 specializations.

Use -march=atom for atom32 as well.

Use -mcpu=cell for Cell PPU - it's not documented, but GCC 4.6 has it.

Remove ancient/untested rs64a support from ppc64
---
 src/build-data/arch/ppc64.txt |  1 -
 src/build-data/cc/gcc.txt     | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/build-data')

diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt
index 7a2e6b6b3..954d9181e 100644
--- a/src/build-data/arch/ppc64.txt
+++ b/src/build-data/arch/ppc64.txt
@@ -11,7 +11,6 @@ g5 -> ppc970
 </submodel_aliases>
 
 <submodels>
-rs64a
 ppc970
 power3
 power4
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index aadb3ad1f..14d6eff2f 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -39,23 +39,23 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 </so_link_flags>
 
 <mach_opt>
-# Specializations first (they don't need to be, just clearer)
-i386           -> "-mtune=i686 -momit-leaf-frame-pointer"
-ppc601         -> "-mpowerpc -mcpu=601"
+ppc601      -> "-mpowerpc -mcpu=601"
+cellppu     -> "-mcpu=cell"
+e500v2      -> "-mcpu=8548"
+atom32      -> "-march=atom -momit-leaf-frame-pointer"
+
+alpha-ev68  -> "-mcpu=ev67"
+alpha-ev7   -> "-mcpu=ev67"
 
 # The patch from Debian bug 594159 has this, don't know why though...
-sh4            -> "-m4 -mieee"
+sh4         -> "-m4 -mieee"
 
-# From http://wiki.debian.org/PowerPCSPEPort
-e500v2         -> "-mcpu=8548"
+# This is mostly for Debian's benefit
+i486        -> "-mtune=generic -momit-leaf-frame-pointer"
 
 # Until GCC gets -march support for these models
-nehalem        -> "-march=core2 -msse4.1 -msse4.2"
-westmere       -> "-march=core2 -maes -msse4.1 -msse4.2"
-atom32         -> "-march=i686 -msse2 -mssse3"
-cellppu        -> ""
-alpha-ev68     -> "-mcpu=ev6"
-alpha-ev7      -> "-mcpu=ev6"
+nehalem     -> "-march=core2 -msse4.1 -msse4.2 -momit-leaf-frame-pointer"
+westmere    -> "-march=core2 -maes -msse4.1 -msse4.2 -momit-leaf-frame-pointer"
 
 # Default family options (SUBMODEL is substitued with the real submodel)
 # Anything after the quotes is what should be *removed* from the submodel name
-- 
cgit v1.2.3