[pkgsrc/trunk]: pkgsrc/devel/libffi Restore NetBSD/eARM support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44c39d8187aa
branches:  trunk
changeset: 641545:44c39d8187aa
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 10 21:29:40 2014 +0000

description:
Restore NetBSD/eARM support

diffstat:

 devel/libffi/distinfo                     |   4 ++--
 devel/libffi/patches/patch-src_arm_sysv.S |  30 +++++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)

diffs (97 lines):

diff -r ff175e36258c -r 44c39d8187aa devel/libffi/distinfo
--- a/devel/libffi/distinfo     Mon Nov 10 21:21:21 2014 +0000
+++ b/devel/libffi/distinfo     Mon Nov 10 21:29:40 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2014/11/04 21:40:05 joerg Exp $
+$NetBSD: distinfo,v 1.37 2014/11/10 21:29:40 joerg Exp $
 
 SHA1 (libffi-3.1.tar.gz) = cb373ef2115ec7c57913b84ca72eee14b10ccdc3
 RMD160 (libffi-3.1.tar.gz) = 2445ad6cf9cf42adbd29b9ced4cd29f252864ec5
@@ -13,7 +13,7 @@
 SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b
 SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153
 SHA1 (patch-fficonfig.h.in) = fd85fa767bc057c843ff71cc61bedfcff84def43
-SHA1 (patch-src_arm_sysv.S) = 323eb9f56a53ced173b4c542080e0845edc8d516
+SHA1 (patch-src_arm_sysv.S) = ea294af156566c6e6f63810358de89cba6213c4f
 SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077
 SHA1 (patch-src_m88k_ffi.c) = e4b7382c3d6e253b8c1c6054150c530c21d018de
 SHA1 (patch-src_m88k_ffitarget.h) = e8479bc3aa876f5e6d52a4d578c5da88291c6646
diff -r ff175e36258c -r 44c39d8187aa devel/libffi/patches/patch-src_arm_sysv.S
--- a/devel/libffi/patches/patch-src_arm_sysv.S Mon Nov 10 21:21:21 2014 +0000
+++ b/devel/libffi/patches/patch-src_arm_sysv.S Mon Nov 10 21:29:40 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_arm_sysv.S,v 1.5 2014/10/28 12:51:03 adam Exp $
+$NetBSD: patch-src_arm_sysv.S,v 1.6 2014/11/10 21:29:40 joerg Exp $
 
 --- src/arm/sysv.S.orig        2014-04-25 17:45:13.000000000 +0000
 +++ src/arm/sysv.S
@@ -20,7 +20,23 @@
  #define UNWIND
  #else
  #define UNWIND @
-@@ -160,6 +162,7 @@ ARM_FUNC_START(ffi_call_SYSV)
+@@ -121,6 +123,7 @@
+       bx pc; \
+       nop; \
+       .arm; \
++      .cfi_startproc; \
+       UNWIND .fnstart; \
+ _L__##name:
+ #else
+@@ -129,6 +132,7 @@ _L__##name:
+       .align 2; \
+       .arm; \
+       ENTRY(name); \
++      .cfi_startproc; \
+       UNWIND .fnstart
+ #endif
+ 
+@@ -160,6 +164,7 @@ ARM_FUNC_START(ffi_call_SYSV)
        @ Save registers
          stmfd sp!, {r0-r3, fp, lr}
        UNWIND .save    {r0-r3, fp, lr}
@@ -28,7 +44,7 @@
        mov     fp, sp
  
        UNWIND .setfp   fp, sp
-@@ -238,6 +241,7 @@ LSYM(Lepilogue):
+@@ -238,6 +243,7 @@ LSYM(Lepilogue):
  
  .ffi_call_SYSV_end:
        UNWIND .fnend
@@ -36,7 +52,7 @@
  #ifdef __ELF__
          .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
  #endif
-@@ -313,6 +317,7 @@ ARM_FUNC_START(ffi_closure_SYSV)
+@@ -313,6 +319,7 @@ ARM_FUNC_START(ffi_closure_SYSV)
  
  .ffi_closure_SYSV_end:
        UNWIND .fnend
@@ -44,7 +60,7 @@
  #ifdef __ELF__
          .size    CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
  #endif
-@@ -396,7 +401,7 @@ LSYM(Lbase_args):
+@@ -396,7 +403,7 @@ LSYM(Lbase_args):
        beq     LSYM(Lepilogue_vfp)
  
        cmp     r3, #FFI_TYPE_SINT64
@@ -53,7 +69,7 @@
        beq     LSYM(Lepilogue_vfp)
  
        cmp     r3, #FFI_TYPE_FLOAT
-@@ -416,6 +421,7 @@ LSYM(Lepilogue_vfp):
+@@ -416,6 +423,7 @@ LSYM(Lepilogue_vfp):
  
  .ffi_call_VFP_end:
        UNWIND .fnend
@@ -61,7 +77,7 @@
          .size    CNAME(ffi_call_VFP),.ffi_call_VFP_end-CNAME(ffi_call_VFP)
  
  
-@@ -478,6 +484,7 @@ ARM_FUNC_START(ffi_closure_VFP)
+@@ -478,6 +486,7 @@ ARM_FUNC_START(ffi_closure_VFP)
  
  .ffi_closure_VFP_end:
        UNWIND .fnend