Mon Mar 23 15:34:18 2015 UTC ()
Disable incompatible assembly sections on 32-bit OSX.  Based on MacPorts fix
in http://trac.macports.org/ticket/44170


(jperkin)
diff -r1.39 -r1.40 pkgsrc/devel/libffi/distinfo
diff -r0 -r1.1 pkgsrc/devel/libffi/patches/patch-src_x86_win32.S
cvs diff -r1.39 -r1.40 pkgsrc/devel/libffi/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libffi/distinfo 2015/01/09 15:10:51 1.39
+++ pkgsrc/devel/libffi/distinfo 2015/03/23 15:34:18 1.40
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.39 2015/01/09 15:10:51 martin Exp $ 1$NetBSD: distinfo,v 1.40 2015/03/23 15:34:18 jperkin Exp $
2 2
3SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6 3SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6
4RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd 4RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd
5Size (libffi-3.2.1.tar.gz) = 940837 bytes 5Size (libffi-3.2.1.tar.gz) = 940837 bytes
6SHA1 (patch-aa) = 7748465dc903b53568999fc8e0caf4ea3fbc5778 6SHA1 (patch-aa) = 7748465dc903b53568999fc8e0caf4ea3fbc5778
7SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb 7SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb
8SHA1 (patch-ad) = 8bb3ec9ea69a8c06b0b1963b3f24018c6384c249 8SHA1 (patch-ad) = 8bb3ec9ea69a8c06b0b1963b3f24018c6384c249
9SHA1 (patch-ae) = 3d8cd3bcd834876f6e60ae519dca8c0b0ba0d4d1 9SHA1 (patch-ae) = 3d8cd3bcd834876f6e60ae519dca8c0b0ba0d4d1
10SHA1 (patch-af) = 2c7ca79ef980a2561333bf79a18df1ecb0bbb9f7 10SHA1 (patch-af) = 2c7ca79ef980a2561333bf79a18df1ecb0bbb9f7
11SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2 11SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2
12SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153 12SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153
13SHA1 (patch-src_alpha_osf.S) = 3fa2aab1924bc445fa2f76835c3fd38e5a3898f9 13SHA1 (patch-src_alpha_osf.S) = 3fa2aab1924bc445fa2f76835c3fd38e5a3898f9
14SHA1 (patch-src_arm_sysv.S) = ea294af156566c6e6f63810358de89cba6213c4f 14SHA1 (patch-src_arm_sysv.S) = ea294af156566c6e6f63810358de89cba6213c4f
15SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077 15SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077
 16SHA1 (patch-src_x86_win32.S) = 8a41cbc7237d6a171605a66e91d8d92a57181569
File Added: pkgsrc/devel/libffi/patches/Attic/patch-src_x86_win32.S
$NetBSD: patch-src_x86_win32.S,v 1.1 2015/03/23 15:34:18 jperkin Exp $

Disable incompatible assembly sections on 32-bit OSX.  Based on MacPorts fix
in http://trac.macports.org/ticket/44170

--- src/x86/win32.S.orig	2014-11-11 14:41:37.000000000 +0000
+++ src/x86/win32.S
@@ -1182,6 +1182,7 @@ L_ffi_closure_WIN32_inner$stub:
         hlt ; hlt ; hlt ; hlt ; hlt
 #endif
 
+#if !defined(X86_DARWIN)
 #if defined(X86_WIN32) && !defined(__OS2__)
         .section	.eh_frame,"w"
 #endif
@@ -1343,6 +1344,7 @@ L_ffi_closure_WIN32_inner$stub:
         /* End of DW_CFA_xxx CFI instructions.  */
         .align 4
 .LEFDE5:
+#endif /* X86_DARWIN */
 
 #endif /* !_MSC_VER */