[llvm-branch-commits] [llvm-gcc-branch] r110620 - in /llvm-gcc-4.2/branches/Apple/Pertwee: ./ gcc/config/arm/arm.h

[Bob Wilson]

Author: bwilson
Date: Mon Aug  9 18:03:35 2010
New Revision: 110620

URL: http://llvm.org/viewvc/llvm-project?rev=110620&view=rev
Log:
--- Merging r110619 into '.':
U    gcc/config/arm/arm.h

Modified:
    llvm-gcc-4.2/branches/Apple/Pertwee/   (props changed)
    llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.h

Propchange: llvm-gcc-4.2/branches/Apple/Pertwee/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  9 18:03:35 2010
@@ -1 +1 @@
-/llvm-gcc-4.2/trunk:110043,110250,110459,110479,110501
+/llvm-gcc-4.2/trunk:110043,110250,110459,110479,110501,110619

Modified: llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.h?rev=110620&r1=110619&r2=110620&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.h Mon Aug  9 18:03:35 2010
@@ -3503,8 +3503,13 @@
     } \
     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							\