[cfe-commits] r79902 - in /cfe/trunk: lib/Driver/Driver.cpp test/Driver/dragonfly.c test/Driver/freebsd.c test/Driver/openbsd.c

[Daniel Dunbar]

Author: ddunbar
Date: Mon Aug 24 04:16:49 2009
New Revision: 79902

URL: http://llvm.org/viewvc/llvm-project?rev=79902&view=rev
Log:
Remove arch normalization from Driver, this should be unnecessary now that
things have moved to llvm::Triple.

Modified:
    cfe/trunk/lib/Driver/Driver.cpp
    cfe/trunk/test/Driver/dragonfly.c
    cfe/trunk/test/Driver/freebsd.c
    cfe/trunk/test/Driver/openbsd.c

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

==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Mon Aug 24 04:16:49 2009
@@ -1246,20 +1246,6 @@
   llvm::PrettyStackTraceString CrashInfo("Constructing host");
   llvm::Triple Triple(TripleStr);
 
-  // Normalize Arch a bit. 
-  //
-  // FIXME: We shouldn't need to do this once everything goes through the triple
-  // interface.
-  if (Triple.getArchName() == "i686") 
-    Triple.setArchName("i386");
-  else if (Triple.getArchName() == "amd64")
-    Triple.setArchName("x86_64");
-  else if (Triple.getArchName() == "ppc" || 
-           Triple.getArchName() == "Power Macintosh")
-    Triple.setArchName("powerpc");
-  else if (Triple.getArchName() == "ppc64")
-    Triple.setArchName("powerpc64");
-
   switch (Triple.getOS()) {
   case llvm::Triple::AuroraUX:
     return createAuroraUXHostInfo(*this, Triple);

Modified: cfe/trunk/test/Driver/dragonfly.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/dragonfly.c?rev=79902&r1=79901&r2=79902&view=diff

==============================================================================
--- cfe/trunk/test/Driver/dragonfly.c (original)
+++ cfe/trunk/test/Driver/dragonfly.c Mon Aug 24 04:16:49 2009
@@ -1,5 +1,5 @@
 // RUN: clang -ccc-host-triple amd64-pc-dragonfly %s -### 2> %t.log &&
-// RUN: grep 'clang-cc" "-triple" "x86_64-pc-dragonfly"' %t.log &&
+// RUN: grep 'clang-cc" "-triple" "amd64-pc-dragonfly"' %t.log &&
 // RUN: grep 'as" "-o" ".*\.o" ".*\.s' %t.log &&
 // RUN: grep 'ld" "-dynamic-linker" ".*ld-elf.*" "-o" "a\.out" ".*crt1.o" ".*crti.o" ".*crtbegin.o" ".*\.o" "-L.*/gcc.*" .* "-lc" "-lgcc" ".*crtend.o" ".*crtn.o"' %t.log &&
 // RUN: true

Modified: cfe/trunk/test/Driver/freebsd.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/freebsd.c?rev=79902&r1=79901&r2=79902&view=diff

==============================================================================
--- cfe/trunk/test/Driver/freebsd.c (original)
+++ cfe/trunk/test/Driver/freebsd.c Mon Aug 24 04:16:49 2009
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-clang-archs "" -ccc-host-triple ppc64-pc-freebsd8 %s -### 2> %t.log &&
+// RUN: clang -ccc-clang-archs "" -ccc-host-triple powerpc64-pc-freebsd8 %s -### 2> %t.log &&
 // RUN: cat %t.log &&
 // RUN: grep 'clang-cc" "-triple" "powerpc64-pc-freebsd8"' %t.log &&
 // RUN: grep 'as" "-o" ".*\.o" ".*\.s' %t.log &&

Modified: cfe/trunk/test/Driver/openbsd.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/openbsd.c?rev=79902&r1=79901&r2=79902&view=diff

==============================================================================
--- cfe/trunk/test/Driver/openbsd.c (original)
+++ cfe/trunk/test/Driver/openbsd.c Mon Aug 24 04:16:49 2009
@@ -1,5 +1,5 @@
 // RUN: clang -ccc-clang-archs "" -ccc-host-triple i686-pc-openbsd %s -### 2> %t.log &&
-// RUN: grep 'clang-cc" "-triple" "i386-pc-openbsd"' %t.log &&
+// RUN: grep 'clang-cc" "-triple" "i686-pc-openbsd"' %t.log &&
 // RUN: grep 'as" "-o" ".*\.o" ".*\.s' %t.log &&
 // RUN: grep 'ld" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" ".*ld.so" "-o" "a\.out" ".*crt0.o" ".*crtbegin.o" ".*\.o" "-lgcc" "-lc" "-lgcc" ".*crtend.o"' %t.log &&
 // RUN: true