diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2011-10-30 00:20:28 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2011-10-30 00:20:28 +0000 |
| commit | d32fba2379f35969061428ab3262a1ec48a7b65f (patch) | |
| tree | ab323e2bdf8b38f5b2fe7078a40be9d761c64a16 /clang/lib/Driver/ToolChains.cpp | |
| parent | f525e37c5db34cc8a799d95166c03fa6c0806926 (diff) | |
| download | bcm5719-llvm-d32fba2379f35969061428ab3262a1ec48a7b65f.tar.gz bcm5719-llvm-d32fba2379f35969061428ab3262a1ec48a7b65f.zip | |
Stop disabling integrated assembler with -static. <rdar://problem/10175391>
The integrated assembler seems to be working pretty well for -static code
now, so remove the hacks to disable it.
llvm-svn: 143304
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index dd92266ec67..d88017ff78b 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -210,15 +210,9 @@ Tool &Darwin::SelectTool(const Compilation &C, const JobAction &JA, } else Key = JA.getKind(); - // FIXME: This doesn't belong here, but ideally we will support static soon - // anyway. - bool HasStatic = (C.getArgs().hasArg(options::OPT_mkernel) || - C.getArgs().hasArg(options::OPT_static) || - C.getArgs().hasArg(options::OPT_fapple_kext)); - bool IsIADefault = IsIntegratedAssemblerDefault() && !HasStatic; bool UseIntegratedAs = C.getArgs().hasFlag(options::OPT_integrated_as, options::OPT_no_integrated_as, - IsIADefault); + IsIntegratedAssemblerDefault()); Tool *&T = Tools[Key]; if (!T) { |
