diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 8 | ||||
| -rw-r--r-- | clang/test/CodeGen/arm-no-movt.c | 7 | ||||
| -rw-r--r-- | clang/test/Driver/arm-no-movt.c | 9 |
3 files changed, 20 insertions, 4 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 8c11992f1f8..89e3987170b 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -718,6 +718,10 @@ static void getARMTargetFeatures(const Driver &D, const llvm::Triple &Triple, } else if (KernelOrKext && (!Triple.isiOS() || Triple.isOSVersionLT(6))) { Features.push_back("+long-calls"); } + + // The kext linker doesn't know how to deal with movw/movt. + if (KernelOrKext) + Features.push_back("+no-movt"); } void Clang::AddARMTargetArgs(const ArgList &Args, ArgStringList &CmdArgs, @@ -793,10 +797,6 @@ void Clang::AddARMTargetArgs(const ArgList &Args, ArgStringList &CmdArgs, if (KernelOrKext) { CmdArgs.push_back("-backend-option"); CmdArgs.push_back("-arm-strict-align"); - - // The kext linker doesn't know how to deal with movw/movt. - CmdArgs.push_back("-backend-option"); - CmdArgs.push_back("-arm-use-movt=0"); } // -mkernel implies -mstrict-align; don't add the redundant option. diff --git a/clang/test/CodeGen/arm-no-movt.c b/clang/test/CodeGen/arm-no-movt.c new file mode 100644 index 00000000000..0773941fb38 --- /dev/null +++ b/clang/test/CodeGen/arm-no-movt.c @@ -0,0 +1,7 @@ +// RUN: %clang_cc1 -triple thumbv7-apple-ios5 -target-feature +no-movt -emit-llvm -o - %s | FileCheck -check-prefix=NO-MOVT %s +// RUN: %clang_cc1 -triple thumbv7-apple-ios5 -emit-llvm -o - %s | FileCheck -check-prefix=MOVT %s + +// NO-MOVT: attributes #0 = { {{.*}} "target-features"="+no-movt" +// MOVT-NOT: attributes #0 = { {{.*}} "target-features"="+no-movt" + +int foo1(int a) { return a; } diff --git a/clang/test/Driver/arm-no-movt.c b/clang/test/Driver/arm-no-movt.c new file mode 100644 index 00000000000..9684d0e16cc --- /dev/null +++ b/clang/test/Driver/arm-no-movt.c @@ -0,0 +1,9 @@ +// RUN: %clang -target armv7-apple-darwin -### %s 2>&1 \ +// RUN: | FileCheck %s -check-prefix CHECK-DEFAULT + +// RUN: %clang -target armv7-apple-darwin -mkernel -### %s 2>&1 \ +// RUN: | FileCheck %s -check-prefix CHECK-KERNEL + +// CHECK-DEFAULT-NOT: "-target-feature" "+no-movt" + +// CHECK-KERNEL: "-target-feature" "+no-movt" |
