This revision was automatically updated to reflect the committed changes. Closed by commit rL242368: [ARM] Pass subtarget feature "+no-movt" instead of passing backend option (authored by ahatanak).
Changed prior to commit: http://reviews.llvm.org/D11025?vs=29232&id=29859#toc Repository: rL LLVM http://reviews.llvm.org/D11025 Files: cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/CodeGen/arm-no-movt.c cfe/trunk/test/Driver/arm-no-movt.c Index: cfe/trunk/test/CodeGen/arm-no-movt.c =================================================================== --- cfe/trunk/test/CodeGen/arm-no-movt.c +++ cfe/trunk/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; } Index: cfe/trunk/test/Driver/arm-no-movt.c =================================================================== --- cfe/trunk/test/Driver/arm-no-movt.c +++ cfe/trunk/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" Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -718,6 +718,10 @@ } 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 @@ 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.
Index: cfe/trunk/test/CodeGen/arm-no-movt.c =================================================================== --- cfe/trunk/test/CodeGen/arm-no-movt.c +++ cfe/trunk/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; } Index: cfe/trunk/test/Driver/arm-no-movt.c =================================================================== --- cfe/trunk/test/Driver/arm-no-movt.c +++ cfe/trunk/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" Index: cfe/trunk/lib/Driver/Tools.cpp =================================================================== --- cfe/trunk/lib/Driver/Tools.cpp +++ cfe/trunk/lib/Driver/Tools.cpp @@ -718,6 +718,10 @@ } 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 @@ 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.
_______________________________________________ cfe-commits mailing list cfe-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits