[cfe-commits] r70647 - in /cfe/trunk: lib/Driver/Tools.cpp test/Driver/unknown-gcc-arch.c

[Daniel Dunbar]

Author: ddunbar
Date: Sat May  2 16:41:52 2009
New Revision: 70647

URL: http://llvm.org/viewvc/llvm-project?rev=70647&view=rev
Log:
Driver: When using the generic gcc tool, pass -m32 or -m64 if we
recognize the architecture.
 - This is an attempt to force gcc to the write target.

 - PR4094.

Added:
    cfe/trunk/test/Driver/unknown-gcc-arch.c
Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=70647&r1=70646&r2=70647&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Sat May  2 16:41:52 2009
@@ -617,7 +617,8 @@
     if (A->getOption().hasForwardToGCC()) {
       // It is unfortunate that we have to claim here, as this means
       // we will basically never report anything interesting for
-      // platforms using a generic gcc.
+      // platforms using a generic gcc, even if we are just using gcc
+      // to get to the assembler.
       A->claim();
       A->render(Args, CmdArgs);
     }
@@ -638,6 +639,14 @@
     CmdArgs.push_back(Str);
   }
 
+  // Try to force gcc to match the tool chain we want, if we recognize
+  // the arch.
+  const char *Str = getToolChain().getArchName().c_str();
+  if (strcmp(Str, "i386") == 0 || strcmp(Str, "powerpc") == 0)
+    CmdArgs.push_back("-m32");
+  else if (strcmp(Str, "x86_64") == 0 || strcmp(Str, "powerpc64") == 0)
+    CmdArgs.push_back("-m64");
+
   if (Output.isPipe()) {
     CmdArgs.push_back("-o");
     CmdArgs.push_back("-");

Added: cfe/trunk/test/Driver/unknown-gcc-arch.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/unknown-gcc-arch.c?rev=70647&view=auto

==============================================================================
--- cfe/trunk/test/Driver/unknown-gcc-arch.c (added)
+++ cfe/trunk/test/Driver/unknown-gcc-arch.c Sat May  2 16:41:52 2009
@@ -0,0 +1,8 @@
+// RUN: clang -ccc-host-triple x86_64-unknown-unknown -c -x assembler %s -### 2> %t.log &&
+// RUN: grep '.*gcc.*"-m64"' %t.log &&
+// RUN: clang -ccc-host-triple x86_64-unknown-unknown -c -x assembler %s -### -m32 2> %t.log &&
+// RUN: grep '.*gcc.*"-m32"' %t.log &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -c -x assembler %s -### 2> %t.log &&
+// RUN: grep '.*gcc.*"-m32"' %t.log &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -c -x assembler %s -### -m64 2> %t.log &&
+// RUN: grep '.*gcc.*"-m64"' %t.log