r242741 - Revert r242736.

[Akira Hatanaka]

Author: ahatanak
Date: Mon Jul 20 18:53:02 2015
New Revision: 242741

URL: http://llvm.org/viewvc/llvm-project?rev=242741&view=rev
Log:
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.

Modified:
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/test/Driver/arm-fixed-r9.c

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=242741&r1=242740&r2=242741&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Jul 20 18:53:02 2015
@@ -719,12 +719,6 @@ static void getARMTargetFeatures(const D
       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 @@ void Clang::AddARMTargetArgs(const ArgLi
                     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

Modified: cfe/trunk/test/Driver/arm-fixed-r9.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-fixed-r9.c?rev=242741&r1=242740&r2=242741&view=diff
==============================================================================
--- cfe/trunk/test/Driver/arm-fixed-r9.c (original)
+++ cfe/trunk/test/Driver/arm-fixed-r9.c Mon Jul 20 18:53:02 2015
@@ -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: "-target-feature" "+reserve-r9"
+// CHECK-FIXED-R9: "-backend-option" "-arm-reserve-r9"