From ff69cb87512464e135e2207f62c0052ed58c176a Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 15 Aug 2011 13:52:00 +0000
Subject: Avoid using -march=i386 if an i386 is 'detected', instead use
 -mtune=generic as with i486. Python's platform reports an i386 when running
 on a Core Duo on MacOS X 10.6, then using -march=i368 causes a link failure
 due to missing atomic adds in libstdc++. PR 152

Also use generic for i586.
---
 src/build-data/cc/gcc.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/build-data')

diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 14d6eff2f..23da2a972 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -39,6 +39,11 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 </so_link_flags>
 
 <mach_opt>
+# Avoid using -march=i[345]86, instead tune for generic
+i386        -> "-mtune=generic -momit-leaf-frame-pointer"
+i486        -> "-mtune=generic -momit-leaf-frame-pointer"
+i586        -> "-mtune=generic -momit-leaf-frame-pointer"
+
 ppc601      -> "-mpowerpc -mcpu=601"
 cellppu     -> "-mcpu=cell"
 e500v2      -> "-mcpu=8548"
@@ -50,8 +55,6 @@ alpha-ev7   -> "-mcpu=ev67"
 # The patch from Debian bug 594159 has this, don't know why though...
 sh4         -> "-m4 -mieee"
 
-# 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 -momit-leaf-frame-pointer"
-- 
cgit v1.2.3