[cfe-commits] r62146 - /cfe/trunk/tools/ccc/ccclib/Tools.py

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 12 22:51:51 2009
New Revision: 62146

URL: http://llvm.org/viewvc/llvm-project?rev=62146&view=rev
Log:
ccc: Darwin/CC1: Hardcode (for now) some -m options to match gcc.

Modified:
    cfe/trunk/tools/ccc/ccclib/Tools.py

Modified: cfe/trunk/tools/ccc/ccclib/Tools.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/ccclib/Tools.py?rev=62146&r1=62145&r2=62146&view=diff

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/Tools.py (original)
+++ cfe/trunk/tools/ccc/ccclib/Tools.py Mon Jan 12 22:51:51 2009
@@ -204,10 +204,10 @@
         # FIXME: As with ld, something else is going on. My best guess
         # is gcc is faking an -mmacosx-version-min
         # somewhere. Investigate.
-        if (not arglist.getLastArg(arglist.parser.m_macosxVersionMinOption) and
-            not arglist.getLastArg(arglist.parser.m_iphoneosVersionMinOption)):
-            cmd_args.append('-mmacosx-version-min=' + 
-                            self.toolChain.getMacosxVersionMin())
+#        if (not arglist.getLastArg(arglist.parser.m_macosxVersionMinOption) and
+#            not arglist.getLastArg(arglist.parser.m_iphoneosVersionMinOption)):
+#            cmd_args.append('-mmacosx-version-min=' + 
+#                            self.toolChain.getMacosxVersionMin())
 
         # FIXME: Remove faltivec
         # FIXME: Remove mno-fused-madd
@@ -384,6 +384,21 @@
         cmd_args.append(self.getBaseInputName(inputs, arglist))
 
         # FIXME: d*
+        
+        # FIXME: Figure out where these are coming from and
+        # dehardcode.
+        arg = arglist.getLastArg(arglist.parser.m_macosxVersionMinOption)
+        if arg:
+            cmd_args.extend(arglist.render(arg))
+        else:
+            cmd_args.append('-mmacosx-version-min=' + 
+                            self.toolChain.getMacosxVersionMin())
+        if arglist.getValue(arch) == 'x86_64':
+            cmd_args.append('-m64')
+        else:
+            cmd_args.append('-m32')
+        cmd_args.append('-mtune=core2')
+
         # FIXME: m*
         # FIXME: a*