From 7960c82803a501976491d3c21c998a5e779f2380 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Wed, 13 Apr 2011 23:36:29 +0100
Subject: [PATCH] Now that -fvia-C is gone, we don't need -march=i686 on i386
 Darwin

This fixes #5106 (objc compilation was failing on i386 Darwin).
---
 aclocal.m4 |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index e09bda8..0e72d22 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -94,14 +94,10 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
     AC_MSG_CHECKING([Setting up $2, $3, $4 and $5])
     case $$1 in
     i386-apple-darwin)
-        # By default, gcc on OS X will generate SSE
-        # instructions, which need things 16-byte aligned,
-        # but we don't 16-byte align things. Thus drop
-        # back to generic i686 compatibility. Trac #2983.
-        $2="$$2 -march=i686 -m32"
-        $3="$$3 -march=i686 -m32"
+        $2="$$2 -m32"
+        $3="$$3 -m32"
         $4="$$4 -arch i386"
-        $5="$$5 -march=i686 -m32"
+        $5="$$5 -m32"
         ;;
     x86_64-apple-darwin)
         $2="$$2 -m64"
-- 
1.7.10.4