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 | 1a1764bd15406f86d53c51b4c7f8a54afee2a541 (patch) | |
| tree | 9116c854601dffca8cf0f8d47727969131cb3416 /lib/Driver/Driver.cpp | |
| parent | 342f1f8b0a402c5a7f8c5055db7f60a7808f1687 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143304 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Driver.cpp')
| -rw-r--r-- | lib/Driver/Driver.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 75300b5307..a4aa2ed025 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1225,17 +1225,9 @@ static const Tool &SelectToolForJob(Compilation &C, const ToolChain *TC, // bottom up, so what we are actually looking for is an assembler job with a // compiler input. - // 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 IsDarwin = TC->getTriple().isOSDarwin(); - bool IsIADefault = TC->IsIntegratedAssemblerDefault() && - !(HasStatic && IsDarwin); if (C.getArgs().hasFlag(options::OPT_integrated_as, - options::OPT_no_integrated_as, - IsIADefault) && + options::OPT_no_integrated_as, + TC->IsIntegratedAssemblerDefault()) && !C.getArgs().hasArg(options::OPT_save_temps) && isa<AssembleJobAction>(JA) && Inputs->size() == 1 && isa<CompileJobAction>(*Inputs->begin())) { |