Attachment #127890 for bug #171768

Lines 1-12 Link Here

(-)./Makefile 2012-10-22 13:06:53.000000000 +0900 (-7 / +3 lines)
1	# New ports collection makefile for: libffi	1	# Created by: Horance Chou <horance@freedom.ie.cycu.edu.tw>
2	# Date created: 14, June, 1998
3	# Whom: Horance Chou <horance@freedom.ie.cycu.edu.tw>
4	#
5	# $FreeBSD: ports/devel/libffi/Makefile,v 1.32 2011/11/09 15:25:30 miwi Exp $	2	# $FreeBSD: ports/devel/libffi/Makefile,v 1.32 2011/11/09 15:25:30 miwi Exp $
6	#
7	PORTNAME= libffi	3	PORTNAME= libffi
8	PORTVERSION= 3.0.9	4	PORTVERSION= 3.0.11
9	CATEGORIES= devel	5	CATEGORIES= devel
10	MASTER_SITES= ftp://sourceware.org/pub/libffi/	6	MASTER_SITES= ftp://sourceware.org/pub/libffi/
Lines 20-26 Link Here
20	INFO= libffi	16	INFO= libffi
21	MAN3= ffi.3 ffi_call.3 ffi_prep_cif.3	17	MAN3= ffi.3 ffi_call.3 ffi_prep_cif.3 ffi_prep_cif_var.3
22	post-install:	18	post-install:
23	@${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffi.h ${PREFIX}/include/	19	@${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffi.h ${PREFIX}/include/

Lines 1-2 Link Here

(-)./distinfo 2012-09-19 17:30:03.000000000 +0900 (-2 / +2 lines)
1	SHA256 (libffi-3.0.9.tar.gz) = 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452	1	SHA256 (libffi-3.0.11.tar.gz) = 70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283
2	SIZE (libffi-3.0.9.tar.gz) = 731719	2	SIZE (libffi-3.0.11.tar.gz) = 794220




--- configure.orig     2010-11-22 12:53:14.000000000 +0100
+++ configure  2010-11-22 12:53:26.000000000 +0100
@@ -12231,6 +12231,9 @@
   powerpc-*-freebsd*)
       TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
       ;;
+  powerpc64-*-freebsd*)
+        TARGET=POWERPC; TARGETDIR=powerpc
+        ;;
   powerpc*-*-rtems*)
       TARGET=POWERPC; TARGETDIR=powerpc
       ;;
@@ -14484,7 +14487,7 @@

       libffi_cv_as_x86_pcrel=yes
       echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-      if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then
+      if $CC -c conftest.s 2>&1 | grep -i warning > /dev/null; then
           libffi_cv_as_x86_pcrel=no
       fi





--- src/arm/sysv.S.orig        2008-02-15 02:15:41.000000000 +0100
+++ src/arm/sysv.S     2008-04-01 13:25:02.000000000 +0200
@@ -83,14 +83,6 @@
 # define call_reg(x)  mov     lr, pc ; mov    pc, x
 #endif

-/* Conditionally compile unwinder directives.  */
-#ifdef __ARM_EABI__
-#define UNWIND
-#else
-#define UNWIND @
-#endif
-
-
 #if defined(__thumb__) && !defined(__THUMB_INTERWORK__)
 .macro        ARM_FUNC_START name
       .text
@@ -101,7 +93,6 @@
       bx      pc
       nop
       .arm
-      UNWIND .fnstart
 /* A hook to tell gdb that we've switched to ARM mode.  Also used to call
    directly from other local arm routines.  */
 _L__\name:
@@ -112,7 +103,6 @@
       .align 0
       .arm
       ENTRY(\name)
-      UNWIND .fnstart
 .endm
 #endif

@@ -145,11 +135,8 @@
 ARM_FUNC_START ffi_call_SYSV
       @ Save registers
         stmfd sp!, {r0-r3, fp, lr}
-      UNWIND .save    {r0-r3, fp, lr}
       mov     fp, sp

-      UNWIND .setfp   fp, sp
-
       @ Make room for all of the new args.
       sub     sp, fp, r2

@@ -219,7 +206,6 @@
       RETLDM  "r0-r3,fp"

 .ffi_call_SYSV_end:
-      UNWIND .fnend
         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)

 /*
@@ -231,12 +217,9 @@
 */

 ARM_FUNC_START ffi_closure_SYSV
-      UNWIND .pad #16
       add     ip, sp, #16
       stmfd   sp!, {ip, lr}
-      UNWIND .save    {r0, lr}
       add     r2, sp, #8
-      .pad #16
       sub     sp, sp, #16
       str     sp, [sp, #8]
       add     r1, sp, #8
@@ -291,6 +274,5 @@
 #endif

 .ffi_closure_SYSV_end:
-      UNWIND .fnend
         .size    CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)


Lines 5-11 Link Here

(-)./pkg-plist 2012-09-19 17:30:03.000000000 +0900 (-1 / +1 lines)
5	lib/libffi.a	5	lib/libffi.a
6	lib/libffi.la	6	lib/libffi.la
7	lib/libffi.so	7	lib/libffi.so
8	lib/libffi.so.5	8	lib/libffi.so.6
9	libdata/pkgconfig/libffi.pc	9	libdata/pkgconfig/libffi.pc
10	@dirrm lib/libffi-%%PORTVERSION%%/include	10	@dirrm lib/libffi-%%PORTVERSION%%/include
11	@dirrm lib/libffi-%%PORTVERSION%%	11	@dirrm lib/libffi-%%PORTVERSION%%

Return to bug 171768

Lines 1-21 Link Here

(-)./files/patch-configure 1970-01-01 09:00:00.000000000 +0900 (-21 lines)
1	--- configure.orig 2010-11-22 12:53:14.000000000 +0100
2	+++ configure 2010-11-22 12:53:26.000000000 +0100
3	@@ -12231,6 +12231,9 @@
4	powerpc--freebsd)
5	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
6	;;
7	+ powerpc64--freebsd)
8	+ TARGET=POWERPC; TARGETDIR=powerpc
9	+ ;;
10	powerpc--rtems*)
11	TARGET=POWERPC; TARGETDIR=powerpc
12	;;
13	@@ -14484,7 +14487,7 @@
14
15	libffi_cv_as_x86_pcrel=yes
16	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
17	- if $CC $CFLAGS -c conftest.s 2>&1 \| grep -i warning > /dev/null; then
18	+ if $CC -c conftest.s 2>&1 \| grep -i warning > /dev/null; then
19	libffi_cv_as_x86_pcrel=no
20	fi
21

Lines 1-73 Link Here

(-)./files/patch-src_arm_sysv.S 1970-01-01 09:00:00.000000000 +0900 (-73 lines)
1	--- src/arm/sysv.S.orig 2008-02-15 02:15:41.000000000 +0100
2	+++ src/arm/sysv.S 2008-04-01 13:25:02.000000000 +0200
3	@@ -83,14 +83,6 @@
4	# define call_reg(x) mov lr, pc ; mov pc, x
5	#endif
6
7	-/* Conditionally compile unwinder directives. */
8	-#ifdef __ARM_EABI__
9	-#define UNWIND
10	-#else
11	-#define UNWIND @
12	-#endif
13	-
14	-
15	#if defined(__thumb__) && !defined(__THUMB_INTERWORK__)
16	.macro ARM_FUNC_START name
17	.text
18	@@ -101,7 +93,6 @@
19	bx pc
20	nop
21	.arm
22	- UNWIND .fnstart
23	/* A hook to tell gdb that we've switched to ARM mode. Also used to call
24	directly from other local arm routines. */
25	_L__\name:
26	@@ -112,7 +103,6 @@
27	.align 0
28	.arm
29	ENTRY(\name)
30	- UNWIND .fnstart
31	.endm
32	#endif
33
34	@@ -145,11 +135,8 @@
35	ARM_FUNC_START ffi_call_SYSV
36	@ Save registers
37	stmfd sp!, {r0-r3, fp, lr}
38	- UNWIND .save {r0-r3, fp, lr}
39	mov fp, sp
40
41	- UNWIND .setfp fp, sp
42	-
43	@ Make room for all of the new args.
44	sub sp, fp, r2
45
46	@@ -219,7 +206,6 @@
47	RETLDM "r0-r3,fp"
48
49	.ffi_call_SYSV_end:
50	- UNWIND .fnend
51	.size CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
52
53	/*
54	@@ -231,12 +217,9 @@
55	*/
56
57	ARM_FUNC_START ffi_closure_SYSV
58	- UNWIND .pad #16
59	add ip, sp, #16
60	stmfd sp!, {ip, lr}
61	- UNWIND .save {r0, lr}
62	add r2, sp, #8
63	- .pad #16
64	sub sp, sp, #16
65	str sp, [sp, #8]
66	add r1, sp, #8
67	@@ -291,6 +274,5 @@
68	#endif
69
70	.ffi_closure_SYSV_end:
71	- UNWIND .fnend
72	.size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
73