summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortsutsui <tsutsui>2011-12-31 09:58:22 +0000
committertsutsui <tsutsui>2011-12-31 09:58:22 +0000
commitccfeb706c00e5fcddf2ccc1af8f5758bc4e39cd6 (patch)
tree1411d9924a154fae51dedc4d8c3199c55dd71122
parentb5102b99d7337789617812b0930f9fe2067e351c (diff)
downloadpkgsrc-ccfeb706c00e5fcddf2ccc1af8f5758bc4e39cd6.tar.gz
Pull fix from upstream for asm error on NetBSD/arm with newer binutils:
https://github.com/atgreen/libffi/commit/0e5843995f46900ef212531281e08b224464f413#diff-39 > * src/arm/sysv.S (ffi_closure_SYSV): Add UNWIND to .pad directive.
-rw-r--r--devel/libffi/distinfo3
-rw-r--r--devel/libffi/patches/patch-src_arm_sysv.S17
2 files changed, 19 insertions, 1 deletions
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo
index 0c8f40c9c0d..f02f5f9e0a5 100644
--- a/devel/libffi/distinfo
+++ b/devel/libffi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2011/01/21 09:21:57 tnn Exp $
+$NetBSD: distinfo,v 1.20 2011/12/31 09:58:22 tsutsui Exp $
SHA1 (libffi-3.0.9.tar.gz) = 56e41f87780e09d06d279690e53d4ea2c371ea88
RMD160 (libffi-3.0.9.tar.gz) = 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2
SHA1 (patch-ah) = e9580069ede90cd616da7bc230b28acbf5d204a6
SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b
SHA1 (patch-aj) = cd8369bef0149ed044ef16c0eae7b537b4090f1f
+SHA1 (patch-src_arm_sysv.S) = b4a4a1641e116df8dd9bd3896e6bfaa759489cb3
diff --git a/devel/libffi/patches/patch-src_arm_sysv.S b/devel/libffi/patches/patch-src_arm_sysv.S
new file mode 100644
index 00000000000..ff668e23d59
--- /dev/null
+++ b/devel/libffi/patches/patch-src_arm_sysv.S
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_arm_sysv.S,v 1.1 2011/12/31 09:58:22 tsutsui Exp $
+
+Pull fix from upstream for asm error on NetBSD/arm with newer binutils:
+https://github.com/atgreen/libffi/commit/0e5843995f46900ef212531281e08b224464f413#diff-39
+> * src/arm/sysv.S (ffi_closure_SYSV): Add UNWIND to .pad directive.
+
+--- src/arm/sysv.S.orig 2009-12-29 15:22:26.000000000 +0000
++++ src/arm/sysv.S
+@@ -243,7 +243,7 @@ ARM_FUNC_START ffi_closure_SYSV
+ stmfd sp!, {ip, lr}
+ UNWIND .save {r0, lr}
+ add r2, sp, #8
+- .pad #16
++ UNWIND .pad #16
+ sub sp, sp, #16
+ str sp, [sp, #8]
+ add r1, sp, #8