From: Luis Hector Chavez <lhchavez@google.com>
Date: Fri, 7 Oct 2016 21:04:21 +0000 (-0700)
Subject: [nyc-arc] Fix cheets-libffi compilation on ARM
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=7748bd0e4a8f7d7c67b2867a3afdd92420e95a9f;p=android-x86%2Fexternal-libffi.git

[nyc-arc] Fix cheets-libffi compilation on ARM

This is a bug in LLVM: https://llvm.org/bugs/show_bug.cgi?id=20595 . It
was marked as WONTFIX and later fixed upstream in libffi in a different
way via https://github.com/libffi/libffi/commit/e7f15f60e but it does
not cleanly apply. Instead, use the fix mentioned in the LLVM bug
thread.

Bug: 31833456
Test: lunch cheets_arm-eng && m
Change-Id: I602c32dd1463e8aeca95cd06dd19193dee008114
---

diff --git a/src/arm/sysv.S b/src/arm/sysv.S
index 541bbe9..c2b9f0e 100644
--- a/src/arm/sysv.S
+++ b/src/arm/sysv.S
@@ -396,7 +396,7 @@ LSYM(Lbase_args):
 	beq	LSYM(Lepilogue_vfp)
 
 	cmp	r3, #FFI_TYPE_SINT64
-	stmeqia	r2, {r0, r1}
+	stmiaeq	r2, {r0, r1}
 	beq	LSYM(Lepilogue_vfp)
 
 	cmp	r3, #FFI_TYPE_FLOAT