From 2ac05c3a4f4cb355b1c6f5112b1e955c628a8359 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Wed, 11 Nov 2009 06:29:33 +0000
Subject: Remove some CPU specific workarounds for things GCC didn't know
 about, like the Alpha EV67 and MIPS R10000.

---
 src/build-data/cc/gcc.txt | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/build-data/cc/gcc.txt')

diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index b0e77a97f..3cb287f70 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -42,18 +42,14 @@ beos    -> "ld -shared -h $(SONAME)"
 <mach_opt>
 # Specializations first (they don't need to be, just clearer)
 i386           -> "-mtune=i686 -momit-leaf-frame-pointer"
-r10000         -> "-mips4"
-alpha-ev67     -> "-mcpu=ev6" # FIXME: GCC 3.1 and on has -march=ev67
-alpha-ev68     -> "-mcpu=ev6"
-alpha-ev7      -> "-mcpu=ev6"
 ppc601         -> "-mpowerpc -mcpu=601"
-sparc64-ultra3 -> "-mcpu=v9 -mtune=ultrasparc3"
-
-em64t          -> "-march=nocona -momit-leaf-frame-pointer"
-cellppu        -> ""
 
+# Until GCC gets -march support for these models
 nehalem        -> "-march=core2 -msse4.1 -msse4.2"
 westmere       -> "-march=core2 -maes -msse4.1 -msse4.2"
+cellppu        -> ""
+alpha-ev68     -> "-mcpu=ev6"
+alpha-ev7      -> "-mcpu=ev6"
 
 # Default family options (SUBMODEL is substitued with the real submodel)
 # Anything after the quotes is what should be *removed* from the submodel name
@@ -67,7 +63,7 @@ hppa      -> "-march=SUBMODEL" hppa
 m68k      -> "-mSUBMODEL"
 hitachi-sh -> "-mSUBMODEL" hitachi-sh
 sparc32   -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32-
-sparc64   -> "-mcpu=v9 -mtune=ultrasparc"
+sparc64   -> "-mcpu=v9 -mtune=SUBMODEL"
 mips32    -> "-mips1 -mcpu=SUBMODEL" mips32-
 mips64    -> "-mips3 -mcpu=SUBMODEL" mips64-
 ppc       -> "-mcpu=SUBMODEL" ppc
-- 
cgit v1.2.3