From 62c2390a55c56c7973ad08a09fb70b0d337e6401 Mon Sep 17 00:00:00 2001
From: Miao Wang <miaowang@google.com>
Date: Tue, 27 Nov 2018 14:03:31 -0800
Subject: [PATCH] Correctly configure armv8-2a for 32-bit

Bug: 119681317
Test: mm
Test: CtsRenderscriptTestCases
Change-Id: I455c94948430d3cc2dd320cce830ae18be6a93cd
---
 core/combo/arch/arm/armv8-2a.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/combo/arch/arm/armv8-2a.mk b/core/combo/arch/arm/armv8-2a.mk
index e69de29bb2..c1d818243e 100644
--- a/core/combo/arch/arm/armv8-2a.mk
+++ b/core/combo/arch/arm/armv8-2a.mk
@@ -0,0 +1,9 @@
+# Configuration for Linux on ARM.
+# Generating binaries for the ARMv8-2a architecture
+#
+# Many libraries are not aware of armv8-2a, and AArch32 is (almost) a superset
+# of armv7-a-neon. So just let them think we are just like v7.
+ARCH_ARM_HAVE_ARMV7A            := true
+ARCH_ARM_HAVE_VFP               := true
+ARCH_ARM_HAVE_VFP_D32           := true
+ARCH_ARM_HAVE_NEON              := true