X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FTarget%2FARM%2FAsmParser%2FARMAsmParser.cpp;h=5724d471d4f701c9f0b088d9e1f41dce6edce4c0;hp=52b423df17eef6280cd5b6e35834935d2a644a3d;hb=7c1b77248baaeafec5d6433c3d1da9a2e2b69595;hpb=61639fb856c1222bea3fca2c92eba17ec67e94ae

diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 52b423df17e..5724d471d4f 100644
--- 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();
-  STI.setDefaultFeatures(T.getARMCPUForArch(Arch));
+  STI.setDefaultFeatures("", ("+" + ARM::getArchName(ID)).str());
   setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
 
   getTargetStreamer().emitArch(ID);
@@ -9173,7 +9173,7 @@ bool ARMAsmParser::parseDirectiveCPU(SMLoc L) {
   }
 
   MCSubtargetInfo &STI = copySTI();
-  STI.setDefaultFeatures(CPU);
+  STI.setDefaultFeatures(CPU, "");
   setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
 
   return false;