GAS doesn't like unified ARM syntax without explicitly told so.

2 files changed, 22 insertions, 13 deletions

diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo
index 456ab9cf2e1..5a66fb3a190 100644
--- a/devel/libffi/distinfo
+++ b/devel/libffi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2014/06/01 03:53:03 ryoon Exp $
+$NetBSD: distinfo,v 1.34 2014/06/11 11:45:04 joerg Exp $
 
 SHA1 (libffi-3.0.13.tar.gz) = f5230890dc0be42fb5c58fbf793da253155de106
 RMD160 (libffi-3.0.13.tar.gz) = 03f0627c0fcc800d38636258a2fab2d6bb8b6625
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b
 SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153
 SHA1 (patch-configure.ac) = 080d79b5ada93c5073df7dd09c5131fcfe72ce86
 SHA1 (patch-fficonfig.h.in) = fd85fa767bc057c843ff71cc61bedfcff84def43
-SHA1 (patch-src_arm_sysv.S) = faf53358dbc48d1cf8f6a20030b365c8df346547
+SHA1 (patch-src_arm_sysv.S) = c7c8b33bb019c0f41b6866368096a7594314efea
 SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077
 SHA1 (patch-src_m88k_ffi.c) = e4b7382c3d6e253b8c1c6054150c530c21d018de
 SHA1 (patch-src_m88k_ffitarget.h) = e8479bc3aa876f5e6d52a4d578c5da88291c6646
diff --git a/devel/libffi/patches/patch-src_arm_sysv.S b/devel/libffi/patches/patch-src_arm_sysv.S
index 595e2e35e94..fd116b9807c 100644
--- a/devel/libffi/patches/patch-src_arm_sysv.S
+++ b/devel/libffi/patches/patch-src_arm_sysv.S
@@ -1,8 +1,17 @@
-$NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
+$NetBSD: patch-src_arm_sysv.S,v 1.4 2014/06/11 11:45:04 joerg Exp $
 
 --- src/arm/sysv.S.orig	2013-03-16 11:19:39.000000000 +0000
 +++ src/arm/sysv.S
-@@ -103,7 +103,7 @@
+@@ -25,6 +25,8 @@
+    DEALINGS IN THE SOFTWARE.
+    ----------------------------------------------------------------------- */
+ 
++.syntax unified
++
+ #define LIBFFI_ASM	
+ #include <fficonfig.h>
+ #include <ffi.h>
+@@ -103,7 +105,7 @@
  #endif
  
  /* Conditionally compile unwinder directives.  */
@@ -11,7 +20,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  #define UNWIND
  #else
  #define UNWIND @
-@@ -125,6 +125,7 @@
+@@ -125,6 +127,7 @@
  	nop
  	.arm
  	UNWIND .fnstart
@@ -19,7 +28,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  /* A hook to tell gdb that we've switched to ARM mode.  Also used to call
     directly from other local arm routines.  */
  #ifdef __APPLE__
-@@ -144,6 +145,7 @@ _L__\name:
+@@ -144,6 +147,7 @@ _L__\name:
  	ENTRY(\name)
  #endif
  	UNWIND .fnstart
@@ -27,7 +36,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  .endm
  #endif
  
-@@ -175,6 +177,7 @@ ARM_FUNC_START ffi_call_SYSV
+@@ -175,6 +179,7 @@ ARM_FUNC_START ffi_call_SYSV
  	@ Save registers
          stmfd	sp!, {r0-r3, fp, lr}
  	UNWIND .save	{r0-r3, fp, lr}
@@ -35,7 +44,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  	mov	fp, sp
  
  	UNWIND .setfp	fp, sp
-@@ -228,7 +231,7 @@ ARM_FUNC_START ffi_call_SYSV
+@@ -228,7 +233,7 @@ ARM_FUNC_START ffi_call_SYSV
  #if defined(__SOFTFP__) || defined(__ARM_EABI__)
  	cmpne	r3, #FFI_TYPE_DOUBLE
  #endif
@@ -44,7 +53,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  
  #if !defined(__SOFTFP__) && !defined(__ARM_EABI__)
  	beq	LSYM(Lepilogue)
-@@ -253,6 +256,7 @@ LSYM(Lepilogue):
+@@ -253,6 +258,7 @@ LSYM(Lepilogue):
  
  .ffi_call_SYSV_end:
  	UNWIND .fnend
@@ -52,7 +61,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  #ifdef __ELF__
          .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
  #endif
-@@ -328,6 +332,7 @@ ARM_FUNC_START ffi_closure_SYSV
+@@ -328,6 +334,7 @@ ARM_FUNC_START ffi_closure_SYSV
  
  .ffi_closure_SYSV_end:
  	UNWIND .fnend
@@ -60,7 +69,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  #ifdef __ELF__
          .size    CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
  #endif
-@@ -410,7 +415,7 @@ LSYM(Lbase_args):
+@@ -410,7 +417,7 @@ LSYM(Lbase_args):
  	beq	LSYM(Lepilogue_vfp)
  
  	cmp	r3, #FFI_TYPE_SINT64
@@ -69,7 +78,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
  	beq	LSYM(Lepilogue_vfp)
  
  	cmp	r3, #FFI_TYPE_FLOAT
-@@ -430,6 +435,7 @@ LSYM(Lepilogue_vfp):
+@@ -430,6 +437,7 @@ LSYM(Lepilogue_vfp):
  
  .ffi_call_VFP_end:
  	UNWIND .fnend
@@ -77,7 +86,7 @@ $NetBSD: patch-src_arm_sysv.S,v 1.3 2014/05/21 01:36:23 joerg Exp $
          .size    CNAME(ffi_call_VFP),.ffi_call_VFP_end-CNAME(ffi_call_VFP)
  
  
-@@ -492,6 +498,7 @@ ARM_FUNC_START ffi_closure_VFP
+@@ -492,6 +500,7 @@ ARM_FUNC_START ffi_closure_VFP
  
  .ffi_closure_VFP_end:
  	UNWIND .fnend