[llvm-branch-commits] [llvm-branch] r227854 - Merging r227603:

[Hans Wennborg]

Author: hans
Date: Mon Feb  2 14:45:12 2015
New Revision: 227854

URL: http://llvm.org/viewvc/llvm-project?rev=227854&view=rev
Log:
Merging r227603:
------------------------------------------------------------------------
r227603 | compnerd | 2015-01-30 11:35:18 -0800 (Fri, 30 Jan 2015) | 7 lines

ARM: further correct .fpu directive handling

If the original FPU specification involved a restricted VFP unit (d16), ensure
that we reset the functionality when we encounter a new FPU type.  In
particular, if the user specified vfpv3-d16, but switched to a VFPv3 (which has
32 double precision registers), we would fail to reset the D16 feature, and
treat it as being equivalent to vfpv3-d16.
------------------------------------------------------------------------

Added:
    llvm/branches/release_36/test/MC/ARM/pr22395-2.s
      - copied unchanged from r227603, llvm/trunk/test/MC/ARM/pr22395-2.s
Modified:
    llvm/branches/release_36/   (props changed)
    llvm/branches/release_36/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  2 14:45:12 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226664,226708,226711,226755,227005,227085,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226664,226708,226711,226755,227005,227085,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603

Modified: llvm/branches/release_36/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=227854&r1=227853&r2=227854&view=diff
==============================================================================
--- llvm/branches/release_36/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/branches/release_36/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Mon Feb  2 14:45:12 2015
@@ -9197,11 +9197,12 @@ static const struct {
 } FPUs[] = {
     {ARM::VFP, ARM::FeatureVFP2, ARM::FeatureNEON},
     {ARM::VFPV2, ARM::FeatureVFP2, ARM::FeatureNEON},
-    {ARM::VFPV3, ARM::FeatureVFP2 | ARM::FeatureVFP3, ARM::FeatureNEON},
+    {ARM::VFPV3, ARM::FeatureVFP2 | ARM::FeatureVFP3,
+     ARM::FeatureNEON | ARM::FeatureD16},
     {ARM::VFPV3_D16, ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureD16,
      ARM::FeatureNEON},
     {ARM::VFPV4, ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4,
-     ARM::FeatureNEON},
+     ARM::FeatureNEON | ARM::FeatureD16},
     {ARM::VFPV4_D16,
      ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | ARM::FeatureD16,
      ARM::FeatureNEON},
@@ -9210,19 +9211,20 @@ static const struct {
      ARM::FeatureNEON | ARM::FeatureCrypto},
     {ARM::FP_ARMV8, ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
                         ARM::FeatureFPARMv8,
-     ARM::FeatureNEON | ARM::FeatureCrypto},
-    {ARM::NEON, ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureNEON, 0},
+     ARM::FeatureNEON | ARM::FeatureCrypto | ARM::FeatureD16},
+    {ARM::NEON, ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureNEON,
+     ARM::FeatureD16},
     {ARM::NEON_VFPV4,
      ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | ARM::FeatureNEON,
-     0},
+     ARM::FeatureD16},
     {ARM::NEON_FP_ARMV8,
      ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureFPARMv8 | ARM::FeatureNEON,
-     ARM::FeatureCrypto},
+     ARM::FeatureCrypto | ARM::FeatureD16},
     {ARM::CRYPTO_NEON_FP_ARMV8,
      ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureFPARMv8 | ARM::FeatureNEON | ARM::FeatureCrypto,
-     0},
+     ARM::FeatureD16},
     {ARM::SOFTVFP, 0, 0},
 };