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

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
This commit is contained in:
Bob Wilson 2011-10-30 00:20:28 +00:00
parent f525e37c5d
commit d32fba2379
5 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Driver/Driver.cpp
View File

@ -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())) {

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

@ -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) {

10
clang/lib/Driver/Tools.cpp
View File

@ -1036,17 +1036,9 @@ static bool ShouldDisableCFI(const ArgList &Args,
if (TC.getTriple().isOSDarwin()) {
// The native darwin assembler doesn't support cfi directives, so
// we disable them if we think the .s file will be passed to it.
// FIXME: Duplicated code with ToolChains.cpp
// FIXME: This doesn't belong here, but ideally we will support static soon
// anyway.
bool HasStatic = (Args.hasArg(options::OPT_mkernel) ||
Args.hasArg(options::OPT_static) ||
Args.hasArg(options::OPT_fapple_kext));
bool IsIADefault = TC.IsIntegratedAssemblerDefault() && !HasStatic;
bool UseIntegratedAs = Args.hasFlag(options::OPT_integrated_as,
options::OPT_no_integrated_as,
IsIADefault);
TC.IsIntegratedAssemblerDefault());
bool UseCFI = Args.hasFlag(options::OPT_fdwarf2_cfi_asm,
options::OPT_fno_dwarf2_cfi_asm,
UseIntegratedAs);

3
clang/test/Driver/cfi.c
View File

@ -1,4 +1,5 @@
// RUN: %clang -ccc-host-triple i386-apple-darwin10 -static -### %s 2>&1 | \
// RUN: %clang -ccc-host-triple i386-apple-darwin10 \
// RUN: -no-integrated-as -### %s 2>&1 | \
// RUN: FileCheck --check-prefix=CHECK-DARWIN %s
// RUN: %clang -ccc-host-triple i386-pc-linux-gnu -static -### %s 2>&1 | \

7
clang/test/Driver/darwin-as.c
View File

@ -1,9 +1,11 @@
// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -x assembler -c %s -static -dynamic 2>%t
// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -x assembler -c %s \
// RUN: -no-integrated-as -static -dynamic 2>%t
// RUN: FileCheck -check-prefix=STATIC_AND_DYNAMIC-32 --input-file %t %s
//
// CHECK-STATIC_AND_DYNAMIC-32: as{{(.exe)?}}" "-arch" "i386" "-force_cpusubtype_ALL" "-static" "-o"
// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### -x assembler -c %s -static 2>%t
// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### -x assembler -c %s \
// RUN: -no-integrated-as -static 2>%t
// RUN: FileCheck -check-prefix=STATIC-64 --input-file %t %s
//
// CHECK-STATIC-64: as{{(.exe)?}}" "-arch" "x86_64" "-force_cpusubtype_ALL" "-o"
@ -13,4 +15,3 @@
// RUN: FileCheck -check-prefix=ARMV6 --input-file %t %s
//
// CHECK-ARMV6: as{{(.exe)?}}" "-arch" "armv6" "-o"