[ARM] Introduce subtarget features per ARM architecture.

[oota-llvm.git] / lib / Target / ARM / AsmParser / ARMAsmParser.cpp

diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 52b423df17eef6280cd5b6e35834935d2a644a3d..5724d471d4f701c9f0b088d9e1f41dce6edce4c0 100644 (file)
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -9040,7 +9040,7 @@ bool ARMAsmParser::parseDirectiveArch(SMLoc L) {
 
   Triple T;
   MCSubtargetInfo &STI = copySTI();
 
   Triple T;
   MCSubtargetInfo &STI = copySTI();

-  STI.setDefaultFeatures(T.getARMCPUForArch(Arch));
+  STI.setDefaultFeatures("", ("+" + ARM::getArchName(ID)).str());

   setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
 
   getTargetStreamer().emitArch(ID);
   setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
 
   getTargetStreamer().emitArch(ID);


@@ -9173,7 +9173,7 @@ bool ARMAsmParser::parseDirectiveCPU(SMLoc L) {
   }
 
   MCSubtargetInfo &STI = copySTI();
   }
 
   MCSubtargetInfo &STI = copySTI();

-  STI.setDefaultFeatures(CPU);
+  STI.setDefaultFeatures(CPU, "");

   setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
 
   return false;
   setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
 
   return false;