Revert r242736.
r242737 caused builds to fail with the following error message, so I'm
reverting the clang side change too:
error:Too many subtarget features! Bump MAX_SUBTARGET_FEATURES.
llvm-svn: 242741
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 8e5e980..3ae0558 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -719,12 +719,6 @@
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");
@@ -834,6 +828,13 @@
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