diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-07-22 01:47:22 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-07-22 01:47:22 +0000 |
| commit | f5438e3462f37d7c58f847b594b4b3ab84085d67 (patch) | |
| tree | 0a84cdcc3fabe0c9590d75f9f1d874c8c67db836 | |
| parent | af1879141c0fe45550fa0ebea80e8ca4383b1089 (diff) | |
Driver/Darwin: Set -force_cpusubtype_ALL only by default on x86.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@109074 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/Tools.cpp | 4 | ||||
| -rw-r--r-- | test/Driver/darwin-as.c | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 6d13594341..4d13c1fa78 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2229,7 +2229,9 @@ void darwin::Assemble::ConstructJob(Compilation &C, const JobAction &JA, // Derived from asm spec. AddDarwinArch(Args, CmdArgs); - if (!getDarwinToolChain().isTargetIPhoneOS() || + // Use -force_cpusubtype_ALL on x86 by default. + if (getToolChain().getTriple().getArch() == llvm::Triple::x86 || + getToolChain().getTriple().getArch() == llvm::Triple::x86_64 || Args.hasArg(options::OPT_force__cpusubtype__ALL)) CmdArgs.push_back("-force_cpusubtype_ALL"); diff --git a/test/Driver/darwin-as.c b/test/Driver/darwin-as.c index 6410df0856..7d4cdbfcd3 100644 --- a/test/Driver/darwin-as.c +++ b/test/Driver/darwin-as.c @@ -1,10 +1,16 @@ // RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -x assembler -c %s -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: FileCheck -check-prefix=STATIC-64 --input-file %t %s - +// // CHECK-STATIC-64: as{{(.exe)?}}" "-arch" "x86_64" "-force_cpusubtype_ALL" "-o" +// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### \ +// RUN: -arch armv6 -x assembler -c %s 2>%t +// RUN: FileCheck -check-prefix=ARMV6 --input-file %t %s +// +// CHECK-ARMV6: as{{(.exe)?}}" "-arch" "armv6" "-o" + |