diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 13 | ||||
| -rw-r--r-- | clang/test/Driver/arm-fixed-r9.c | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 3ae055801b8..8e5e9804a36 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -719,6 +719,12 @@ static void getARMTargetFeatures(const Driver &D, const llvm::Triple &Triple, Features.push_back("+long-calls"); } + // llvm does not support reserving registers in general. There is support + // for reserving r9 on ARM though (defined as a platform-specific register + // in ARM EABI). + if (Args.hasArg(options::OPT_ffixed_r9)) + Features.push_back("+reserve-r9"); + // The kext linker doesn't know how to deal with movw/movt. if (KernelOrKext) Features.push_back("+no-movt"); @@ -828,13 +834,6 @@ void Clang::AddARMTargetArgs(const ArgList &Args, ArgStringList &CmdArgs, options::OPT_mno_implicit_float, true)) CmdArgs.push_back("-no-implicit-float"); - // llvm does not support reserving registers in general. There is support - // for reserving r9 on ARM though (defined as a platform-specific register - // in ARM EABI). - if (Args.hasArg(options::OPT_ffixed_r9)) { - CmdArgs.push_back("-backend-option"); - CmdArgs.push_back("-arm-reserve-r9"); - } } /// getAArch64TargetCPU - Get the (LLVM) name of the AArch64 cpu we are diff --git a/clang/test/Driver/arm-fixed-r9.c b/clang/test/Driver/arm-fixed-r9.c index 2cec8b4c4fc..74ac336bd7f 100644 --- a/clang/test/Driver/arm-fixed-r9.c +++ b/clang/test/Driver/arm-fixed-r9.c @@ -1,4 +1,4 @@ // RUN: %clang -target arm-none-gnueabi -ffixed-r9 -### %s 2> %t // RUN: FileCheck --check-prefix=CHECK-FIXED-R9 < %t %s -// CHECK-FIXED-R9: "-backend-option" "-arm-reserve-r9" +// CHECK-FIXED-R9: "-target-feature" "+reserve-r9" |
