diff options
| -rw-r--r-- | lib/MC/SubtargetFeature.cpp | 6 | ||||
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/lib/MC/SubtargetFeature.cpp b/lib/MC/SubtargetFeature.cpp index 7f902f1dd7..7625abd465 100644 --- a/lib/MC/SubtargetFeature.cpp +++ b/lib/MC/SubtargetFeature.cpp @@ -370,11 +370,5 @@ void SubtargetFeatures::getDefaultSubtargetFeatures(const Triple& Triple) { AddFeature("64bit"); AddFeature("altivec"); } -// @LOCALMOD-BEGIN - } else if (Triple.getArch() == Triple::arm && - Triple.getOS() == Triple::NativeClient) { - AddFeature("-neon"); - AddFeature("+vfp2"); -// @LOCALMOD-END } } diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp index 7a57e40a17..ffbb115098 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp @@ -89,13 +89,7 @@ std::string ARM_MC::ParseARMTriple(StringRef TT, StringRef CPU) { ARMArchFeature = "+v7,+neon,+db,+t2dsp,+t2xtpk"; else // Use CPU to figure out the exact features. - // @LOCALMOD-BEGIN - // Orig: ARMArchFeature = "+v7"; - // TODO(pdox): Eliminate this strange exception, possibly - // with our own cpu tag. (neon doesn't work, but vfp2 does). - // We also don't seem to handle The DSP features. - ARMArchFeature = "+v7,+db,+vfp2"; - // @LOCALMOD-END + ARMArchFeature = "+v7"; } } else if (SubVer == '6') { if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == '2') |