commit 1aef163a6815e7bff675f83ddec8b063d6082e86
author Amara Emerson <amara.emerson@arm.com> Fri May 03 23:57:17 2013 +0000
committer Amara Emerson <amara.emerson@arm.com> Fri May 03 23:57:17 2013 +0000
tree 03e8e5b1846af11e6274abaf2db22e038d5e5da6
parent 2bb955a6931580c9bb0472aa29b3fbbabe263295

Revert r181009.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181079 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/ARM/ARMAsmPrinter.cpp

diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp
index 2d5dca5..13ec208 100644
--- a/lib/Target/ARM/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -15,6 +15,7 @@
 #define DEBUG_TYPE "asm-printer"
 #include "ARMAsmPrinter.h"
 #include "ARM.h"
+#include "ARMBuildAttrs.h"
 #include "ARMConstantPoolValue.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMTargetMachine.h"
@@ -43,7 +44,6 @@
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
-#include "llvm/Object/ELF_ARM.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ELF.h"
@@ -90,7 +90,7 @@
         break;
       /* GAS requires .fpu to be emitted regardless of EABI attribute */
       case ARMBuildAttrs::Advanced_SIMD_arch:
-      case ARMBuildAttrs::FP_arch:
+      case ARMBuildAttrs::VFP_arch:
         Streamer.EmitRawText(StringRef("\t.fpu ") + String.lower());
         break;
       }
@@ -798,24 +798,24 @@
 
   /* VFPv4 + .fpu */
   if (Subtarget->hasVFP4()) {
-    AttrEmitter->EmitAttribute(ARMBuildAttrs::FP_arch,
+    AttrEmitter->EmitAttribute(ARMBuildAttrs::VFP_arch,
                                ARMBuildAttrs::AllowFPv4A);
     if (emitFPU)
-      AttrEmitter->EmitTextAttribute(ARMBuildAttrs::FP_arch, "vfpv4");
+      AttrEmitter->EmitTextAttribute(ARMBuildAttrs::VFP_arch, "vfpv4");
 
   /* VFPv3 + .fpu */
   } else if (Subtarget->hasVFP3()) {
-    AttrEmitter->EmitAttribute(ARMBuildAttrs::FP_arch,
+    AttrEmitter->EmitAttribute(ARMBuildAttrs::VFP_arch,
                                ARMBuildAttrs::AllowFPv3A);
     if (emitFPU)
-      AttrEmitter->EmitTextAttribute(ARMBuildAttrs::FP_arch, "vfpv3");
+      AttrEmitter->EmitTextAttribute(ARMBuildAttrs::VFP_arch, "vfpv3");
 
   /* VFPv2 + .fpu */
   } else if (Subtarget->hasVFP2()) {
-    AttrEmitter->EmitAttribute(ARMBuildAttrs::FP_arch,
+    AttrEmitter->EmitAttribute(ARMBuildAttrs::VFP_arch,
                                ARMBuildAttrs::AllowFPv2);
     if (emitFPU)
-      AttrEmitter->EmitTextAttribute(ARMBuildAttrs::FP_arch, "vfpv2");
+      AttrEmitter->EmitTextAttribute(ARMBuildAttrs::VFP_arch, "vfpv2");
   }
 
   /* TODO: ARMBuildAttrs::Allowed is not completely accurate,