aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2016-10-07 14:04:21 -0700
committerLuis Hector Chavez <lhchavez@google.com>2016-10-07 14:07:35 -0700
commit7748bd0e4a8f7d7c67b2867a3afdd92420e95a9f (patch)
tree4c2ef763eee7c95d258b2d6b6cd80f22fe04bb57
parentf191c3310b9e813df17024723ffb44370b306491 (diff)
downloadlibffi-7748bd0e4a8f7d7c67b2867a3afdd92420e95a9f.tar.gz
[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
-rw-r--r--src/arm/sysv.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arm/sysv.S b/src/arm/sysv.S
index 541bbe92..c2b9f0e7 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