From e31e323c021ea505b5bef67db3e6d66044a8892e Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 23 Aug 2010 20:58:55 +0000
Subject: [PATCH] Driver/Darwin: Switch to using simplified tool chain by
 default -- what better way to see what will break! :)

llvm-svn: 111840
---
 clang/lib/Driver/HostInfo.cpp |  8 ++------
 clang/test/Driver/darwin-ld.c | 18 ++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/clang/lib/Driver/HostInfo.cpp b/clang/lib/Driver/HostInfo.cpp
index 7c5e430bb7d5..3adcbc0d7cad 100644
--- a/clang/lib/Driver/HostInfo.cpp
+++ b/clang/lib/Driver/HostInfo.cpp
@@ -113,12 +113,8 @@ ToolChain *DarwinHostInfo::CreateToolChain(const ArgList &Args,
     TCTriple.setArch(Arch);
 
     // If we recognized the arch, match it to the toolchains we support.
-    const char *UseNewToolChain = ::getenv("CCC_ENABLE_NEW_DARWIN_TOOLCHAIN");
-    if (UseNewToolChain || 
-        Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb) {
-      TC = new toolchains::DarwinClang(*this, TCTriple);
-    } else if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
-      // We still use the legacy DarwinGCC toolchain on X86.
+    if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb ||
+        Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
       TC = new toolchains::DarwinGCC(*this, TCTriple);
     } else
       TC = new toolchains::Darwin_Generic_GCC(*this, TCTriple);
diff --git a/clang/test/Driver/darwin-ld.c b/clang/test/Driver/darwin-ld.c
index 95e5b5febc43..074957d625a1 100644
--- a/clang/test/Driver/darwin-ld.c
+++ b/clang/test/Driver/darwin-ld.c
@@ -3,20 +3,6 @@
 // RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch i386 -arch x86_64 %s -### -o foo 2> %t.log
 // RUN: grep '".*ld.*" .*"-arch_multiple" "-final_output" "foo"' %t.log
 
-// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -filelist FOO -static 2> %t.log
-// RUN: grep '"-lcrt0.o" .*"-lgcc_static"' %t.log
-// RUN: grep '"-lgcc"' %t.log | count 0
-// RUN: %clang -ccc-host-triple i386-apple-darwin7 -### -filelist FOO 2> %t.log
-// RUN: grep '"-lcrt1.o" .*"-lgcc" "-lSystem"' %t.log
-// RUN: grep '"-lgcc_s"' %t.log | count 0
-// RUN: %clang -ccc-host-triple i386-apple-darwin8 -### -filelist FOO 2> %t.log
-// RUN: grep '"-lcrt1.o" .*"-lgcc_s.10.4" "-lgcc" "-lSystem"' %t.log
-// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -filelist FOO 2> %t.log
-// RUN: grep '"-lcrt1.10.5.o" .*"-lgcc_s.10.5" "-lgcc" "-lSystem"' %t.log
-// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -filelist FOO 2> %t.log
-// RUN: grep '"-lcrt1.10.6.o" .*"-lSystem" "-lgcc"' %t.log
-// RUN: grep '"-lgcc_s"' %t.log | count 0
-
 // Make sure we run dsymutil on source input files.
 // RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -g %s -o BAR 2> %t.log
 // RUN: grep '".*dsymutil" "BAR"' %t.log
@@ -96,7 +82,7 @@
 //
 // LINK_NEWER_NODEMANGLE: ld"
 // LINK_NEWER_NODEMANGLE-NOT: "-demangle"
-// LINK_NEWER_NODEMANGLE: "-lgcc"
+// LINK_NEWER_NODEMANGLE: "-lSystem"
 
 // RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### %t.o \
 // RUN:   -mlinker-version=95 2> %t.log
@@ -104,4 +90,4 @@
 //
 // LINK_OLDER_NODEMANGLE: ld"
 // LINK_OLDER_NODEMANGLE-NOT: "-demangle"
-// LINK_OLDER_NODEMANGLE: "-lgcc"
+// LINK_OLDER_NODEMANGLE: "-lSystem"