--- Merging r110855 into '.':
U    gcc/config/arm/arm.h

llvm-svn: 110856
diff --git a/llvm-gcc-4.2/gcc/config/arm/arm.h b/llvm-gcc-4.2/gcc/config/arm/arm.h
index 379596b..18ebd52 100644
--- a/llvm-gcc-4.2/gcc/config/arm/arm.h
+++ b/llvm-gcc-4.2/gcc/config/arm/arm.h
@@ -3503,13 +3503,8 @@
     } \
     if (TARGET_VFP3)						\
       F.AddFeature("vfp3");					\
-    else {							\
+    else							\
       F.AddFeature("vfp3", false);				\
-      if (TARGET_VFP)						\
-        F.AddFeature("vfp2");					\
-      else							\
-        F.AddFeature("vfp2", false);				\
-    }								\
     if (TARGET_NEON)						\
       F.AddFeature("neon");					\
     else							\