1 files changed, 4 insertions, 7 deletions
diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index 2cd239c81a..9c23ed9871 100644
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -2757,13 +2757,10 @@ ABIArgInfo ARMABIInfo::classifyArgumentType(QualType Ty) const {
     }
   }
 
-  // Turn on byval for APCS and AAPCS.
-  // FIXME: turn on byval for AAPCS_VFP for performance.
-  if (getABIKind() == ARMABIInfo::APCS || getABIKind() == ARMABIInfo::AAPCS) {
-    if (getContext().getTypeSizeInChars(Ty) > CharUnits::fromQuantity(64) ||
-        getContext().getTypeAlign(Ty) > 64) {
-      return ABIArgInfo::getIndirect(0, /*ByVal=*/true);
-    }
+  // Support byval for ARM.
+  if (getContext().getTypeSizeInChars(Ty) > CharUnits::fromQuantity(64) ||
+      getContext().getTypeAlign(Ty) > 64) {
+    return ABIArgInfo::getIndirect(0, /*ByVal=*/true);
   }
 
   // Otherwise, pass by coercing to a structure of the appropriate size.