maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Driver/Darwin: Switch to using simplified tool chain by default -- what better 

way to see what will break! :)

llvm-svn: 111840
This commit is contained in:
Daniel Dunbar 2010-08-23 20:58:55 +00:00
parent 09a4851ead
commit e31e323c02
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Driver/HostInfo.cpp
View File

@ -113,12 +113,8 @@ ToolChain *DarwinHostInfo::CreateToolChain(const ArgList &Args,
TCTriple.setArch(Arch); TCTriple.setArch(Arch);
// If we recognized the arch, match it to the toolchains we support. // If we recognized the arch, match it to the toolchains we support.
const char *UseNewToolChain = ::getenv("CCC_ENABLE_NEW_DARWIN_TOOLCHAIN"); if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb ||
if (UseNewToolChain || Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
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.
TC = new toolchains::DarwinGCC(*this, TCTriple); TC = new toolchains::DarwinGCC(*this, TCTriple);
} else } else
TC = new toolchains::Darwin_Generic_GCC(*this, TCTriple); TC = new toolchains::Darwin_Generic_GCC(*this, TCTriple);

18
clang/test/Driver/darwin-ld.c
View File

@ -3,20 +3,6 @@
// RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch i386 -arch x86_64 %s -### -o foo 2> %t.log // 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: 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. // 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: %clang -ccc-host-triple i386-apple-darwin9 -### -g %s -o BAR 2> %t.log
// RUN: grep '".*dsymutil" "BAR"' %t.log // RUN: grep '".*dsymutil" "BAR"' %t.log
@ -96,7 +82,7 @@
// //
// LINK_NEWER_NODEMANGLE: ld" // LINK_NEWER_NODEMANGLE: ld"
// LINK_NEWER_NODEMANGLE-NOT: "-demangle" // 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: %clang -ccc-host-triple x86_64-apple-darwin10 -### %t.o \
// RUN: -mlinker-version=95 2> %t.log // RUN: -mlinker-version=95 2> %t.log
@ -104,4 +90,4 @@
// //
// LINK_OLDER_NODEMANGLE: ld" // LINK_OLDER_NODEMANGLE: ld"
// LINK_OLDER_NODEMANGLE-NOT: "-demangle" // LINK_OLDER_NODEMANGLE-NOT: "-demangle"
// LINK_OLDER_NODEMANGLE: "-lgcc" // LINK_OLDER_NODEMANGLE: "-lSystem"