aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2018-02-28 23:53:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-28 23:53:01 +0000
commit98cf6e66aabb931334f01118c87799f81d04a032 (patch)
treecba75ad57d73ca410ae509aaef16dafbd6b69d5e
parentf21a0cfe5204ce87e0157f0e50cf8fc13e72952e (diff)
parent5785fad952665125471b06d0910a531a219c4adb (diff)
downloadcpython2-pie-qpr1-s2-release.tar.gz
am: 5785fad952 Change-Id: Ib6bd338a800f3a3800440d5b77693ff52a752e80
-rw-r--r--Modules/_ctypes/libffi/src/arm/sysv.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_ctypes/libffi/src/arm/sysv.S b/Modules/_ctypes/libffi/src/arm/sysv.S
index c2b9f0e76c..fcdfd562c7 100644
--- a/Modules/_ctypes/libffi/src/arm/sysv.S
+++ b/Modules/_ctypes/libffi/src/arm/sysv.S
@@ -360,7 +360,7 @@ ARM_FUNC_START(ffi_call_VFP)
cmp r0, #3
sub ip, fp, #64
flddle d0, [ip]
- fldmiadgt ip, {d0-d7}
+ vldmiagt ip, {d0-d7}
LSYM(Lbase_args):
@ move first 4 parameters in registers
@@ -409,7 +409,7 @@ LSYM(Lbase_args):
cmp r3, #FFI_TYPE_STRUCT_VFP_FLOAT
cmpne r3, #FFI_TYPE_STRUCT_VFP_DOUBLE
- fstmiadeq r2, {d0-d3}
+ vstmiaeq r2, {d0-d3}
LSYM(Lepilogue_vfp):
RETLDM "r0-r3,fp"
@@ -420,7 +420,7 @@ LSYM(Lepilogue_vfp):
ARM_FUNC_START(ffi_closure_VFP)
- fstmfdd sp!, {d0-d7}
+ vpush {d0-d7}
@ r0-r3, then d0-d7
UNWIND .pad #80
add ip, sp, #80
@@ -470,10 +470,10 @@ ARM_FUNC_START(ffi_closure_VFP)
ldmia sp, {r0, r1}
b .Lclosure_epilogue_vfp
.Lretfloat_struct_vfp:
- fldmiad sp, {d0-d1}
+ vldmia sp, {d0-d1}
b .Lclosure_epilogue_vfp
.Lretdouble_struct_vfp:
- fldmiad sp, {d0-d3}
+ vldmia sp, {d0-d3}
b .Lclosure_epilogue_vfp
.ffi_closure_VFP_end: