no need to gzip a smallish patch

(Portage version: 2.1_pre3-r1)

4 files changed, 776 insertions, 4 deletions

diff --git a/dev-libs/ffcall/ChangeLog b/dev-libs/ffcall/ChangeLog
index 810bf17b3c02..00c0dffe8a77 100644
--- a/dev-libs/ffcall/ChangeLog
+++ b/dev-libs/ffcall/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ffcall
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ffcall/ChangeLog,v 1.23 2006/01/08 12:34:21 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ffcall/ChangeLog,v 1.24 2006/01/28 13:22:08 blubb Exp $
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org>
+  +files/ffcall_hppa_1.8-4.2.diff, -files/ffcall_hppa_1.8-4.2.diff.gz,
+  ffcall-1.8d.ebuild:
+  no need to gzip a smallish patch
 
   08 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> metadata.xml:
   Remove retiring dev from metadata.
diff --git a/dev-libs/ffcall/ffcall-1.8d.ebuild b/dev-libs/ffcall/ffcall-1.8d.ebuild
index dc55fa506dd4..021061305dcd 100644
--- a/dev-libs/ffcall/ffcall-1.8d.ebuild
+++ b/dev-libs/ffcall/ffcall-1.8d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ffcall/ffcall-1.8d.ebuild,v 1.20 2005/04/24 02:50:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ffcall/ffcall-1.8d.ebuild,v 1.21 2006/01/28 13:22:08 blubb Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use hppa && epatch ${FILESDIR}/ffcall_hppa_1.8-4.2.diff.gz
+	use hppa && epatch ${FILESDIR}/ffcall_hppa_1.8-4.2.diff
 }
 
 src_compile() {
diff --git a/dev-libs/ffcall/files/ffcall_hppa_1.8-4.2.diff b/dev-libs/ffcall/files/ffcall_hppa_1.8-4.2.diff
new file mode 100644
index 000000000000..d9770a06b3d1
--- /dev/null
+++ b/dev-libs/ffcall/files/ffcall_hppa_1.8-4.2.diff
@@ -0,0 +1,767 @@
+--- ffcall-1.8.orig/autoconf/aclocal.m4
++++ ffcall-1.8/autoconf/aclocal.m4
+@@ -328,7 +328,7 @@
+   alphaev[4-7] | alphaev56 | alphapca5[67] )
+     host_cpu=alpha
+     ;;
+-  hppa1.0 | hppa1.1 | hppa2.0 )
++  hppa1.0 | hppa1.1 | hppa2.0 | hppa64 )
+     host_cpu=hppa
+     ;;
+   powerpc )
+--- ffcall-1.8.orig/avcall/avcall-hppa.s
++++ ffcall-1.8/avcall/avcall-hppa.s
+@@ -1,18 +1,12 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT __builtin_avcall,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
+-__builtin_avcall
++	.label __builtin_avcall
+ 	.PROC
+ 	.CALLINFO FRAME=1152,CALLS,SAVE_RP,ENTRY_GR=3
+ 	.ENTRY
+@@ -30,18 +24,18 @@
+ 	zdep %r21,29,30,%r19
+ 	addl %r19,%r20,%r20
+ 	addl %r19,%r3,%r22
+-L$0005
++	.label L$0005
+ 	ldw 1064(0,%r22),%r19
+ 	ldo 4(%r22),%r22
+ 	ldo 1(%r21),%r21
+ 	comib,> -4,%r21,L$0005
+ 	stws,ma %r19,4(0,%r20)
+-L$0003
++	.label L$0003
+ 	ldw 12(0,%r3),%r20
+ 	ldi 16,%r19
+ 	comclr,<> %r19,%r20,0
+ 	ldw 8(0,%r3),%r28
+-L$0007
++	.label L$0007
+ 	ldw 0(0,%r3),%r19
+ 	ldw 1060(0,%r3),%r26
+ 	ldw 1056(0,%r3),%r25
+@@ -72,17 +66,17 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stw %r29,4(0,%r19)
+-L$0030
++	.label L$0030
+ 	comib,<>,n 13,%r20,L$0032
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	fstws %fr4L,0(0,%r19)
+-L$0032
++	.label L$0032
+ 	comib,<>,n 14,%r20,L$0034
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	fstds %fr4,0(0,%r19)
+-L$0034
++	.label L$0034
+ 	comib,= 15,%r20,L$0076
+ 	ldi 16,%r19
+ 	comb,<>,n %r19,%r20,L$0009
+@@ -94,19 +88,19 @@
+ 	ldb 0(0,%r22),%r19
+ 	bl L$0009,0
+ 	stb %r19,0(0,%r20)
+-L$0040
++	.label L$0040
+ 	comib,<>,n 2,%r19,L$0042
+ 	ldw 8(0,%r3),%r20
+ 	ldh 0(0,%r22),%r19
+ 	bl L$0009,0
+ 	sth %r19,0(0,%r20)
+-L$0042
++	.label L$0042
+ 	comib,<>,n 4,%r19,L$0044
+ 	ldw 8(0,%r3),%r20
+ 	ldw 0(0,%r22),%r19
+ 	bl L$0009,0
+ 	stw %r19,0(0,%r20)
+-L$0044
++	.label L$0044
+ 	comib,<> 8,%r19,L$0046
+ 	ldo 3(%r19),%r19
+ 	ldw 8(0,%r3),%r20
+@@ -116,10 +110,10 @@
+ 	ldw 4(0,%r22),%r19
+ 	bl L$0009,0
+ 	stw %r19,4(0,%r20)
+-L$0046
++	.label L$0046
+ 	extru %r19,29,30,%r21
+ 	addib,<,n -1,%r21,L$0009
+-L$0050
++	.label L$0050
+ 	ldw 8(0,%r3),%r19
+ 	ldwx,s %r21(0,%r22),%r20
+ 	sh2addl %r21,%r19,%r19
+@@ -127,30 +121,30 @@
+ 	stw %r20,0(0,%r19)
+ 	bl L$0079,0
+ 	ldi 0,%r28
+-L$0039
++	.label L$0039
+ 	bb,>=,n %r19,30,L$0009
+ 	bb,>= %r19,28,L$0054
+ 	ldw 16(0,%r3),%r19
+ 	comib,=,n 1,%r19,L$0077
+ 	comib,<>,n 2,%r19,L$0057
+-L$0078
++	.label L$0078
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	sth %r22,0(0,%r19)
+-L$0057
++	.label L$0057
+ 	comib,<> 4,%r19,L$0079
+ 	ldi 0,%r28
+-L$0076
++	.label L$0076
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stw %r22,0(0,%r19)
+-L$0054
++	.label L$0054
+ 	comib,<>,n 1,%r19,L$0061
+-L$0077
++	.label L$0077
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r22,0(0,%r19)
+-L$0061
++	.label L$0061
+ 	comib,<>,n 2,%r19,L$0063
+ 	ldw 8(0,%r3),%r19
+ 	extrs %r22,23,24,%r20
+@@ -158,7 +152,7 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r22,1(0,%r19)
+-L$0063
++	.label L$0063
+ 	comib,<>,n 3,%r19,L$0065
+ 	ldw 8(0,%r3),%r20
+ 	extrs %r22,15,16,%r19
+@@ -169,7 +163,7 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r22,2(0,%r19)
+-L$0065
++	.label L$0065
+ 	comib,<>,n 4,%r19,L$0067
+ 	ldw 8(0,%r3),%r20
+ 	extrs %r22,7,8,%r19
+@@ -183,7 +177,7 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r22,3(0,%r19)
+-L$0067
++	.label L$0067
+ 	comib,<>,n 5,%r19,L$0069
+ 	ldw 8(0,%r3),%r20
+ 	extrs %r22,7,8,%r19
+@@ -199,7 +193,7 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r29,4(0,%r19)
+-L$0069
++	.label L$0069
+ 	comib,<>,n 6,%r19,L$0071
+ 	ldw 8(0,%r3),%r20
+ 	extrs %r22,7,8,%r19
+@@ -218,7 +212,7 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r29,5(0,%r19)
+-L$0071
++	.label L$0071
+ 	comib,<>,n 7,%r19,L$0073
+ 	ldw 8(0,%r3),%r20
+ 	extrs %r22,7,8,%r19
+@@ -240,7 +234,7 @@
+ 	ldw 8(0,%r3),%r19
+ 	bl L$0009,0
+ 	stb %r29,6(0,%r19)
+-L$0073
++	.label L$0073
+ 	comib,<> 8,%r19,L$0079
+ 	ldi 0,%r28
+ 	ldw 8(0,%r3),%r20
+@@ -265,9 +259,9 @@
+ 	stb %r19,6(0,%r20)
+ 	ldw 8(0,%r3),%r19
+ 	stb %r29,7(0,%r19)
+-L$0009
++	.label L$0009
+ 	ldi 0,%r28
+-L$0079
++	.label L$0079
+ 	ldw -1172(0,%r30),%r2
+ 	ldw -1060(0,%r30),%r3
+ 	bv 0(%r2)
+--- ffcall-1.8.orig/callback/trampoline_r/proto-hppa.s
++++ ffcall-1.8/callback/trampoline_r/proto-hppa.s
+@@ -1,18 +1,12 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT tramp,ENTRY,PRIV_LEV=3,RTNVAL=GR
+-tramp
++	.label tramp
+ 	.PROC
+ 	.CALLINFO FRAME=64,CALLS,SAVE_RP
+ 	.ENTRY
+@@ -33,7 +27,7 @@
+ 	.PROCEND
+ 	.align 4
+ 	.EXPORT jump,ENTRY,PRIV_LEV=3,RTNVAL=GR
+-jump
++	.label jump
+ 	.PROC
+ 	.CALLINFO FRAME=0,NO_CALLS
+ 	.ENTRY
+--- ffcall-1.8.orig/callback/trampoline_r/tramp-hppa.s
++++ ffcall-1.8/callback/trampoline_r/tramp-hppa.s
+@@ -9,20 +9,14 @@
+ ; on this software.
+ ;
+ 
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT tramp_r,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR
+-tramp_r
++	.label tramp_r
+ 	.PROC
+ 	.CALLINFO FRAME=0,NO_CALLS
+ 	.ENTRY
+@@ -36,7 +30,7 @@
+ 	depi 0,31,2,%r21
+ 	ldw 4(0,%r21),%r19
+ 	ldw 0(0,%r21),%r21
+-tramp_r_2
++	.label tramp_r_2
+ 	ldsid (0,%r21),%r1
+ 	mtsp %r1,%sr0
+ 	be,n 0(%sr0,%r21)
+--- ffcall-1.8.orig/callback/vacall_r/vacall-hppa.s
++++ ffcall-1.8/callback/vacall_r/vacall-hppa.s
+@@ -1,18 +1,12 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT __vacall_r,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR
+-__vacall_r
++	.label __vacall_r
+ 	.PROC
+ 	.CALLINFO FRAME=192,CALLS,SAVE_RP
+ 	.ENTRY
+@@ -53,26 +47,26 @@
+ 	ldw -212(0,%r30),%r2
+ 	comiclr,= 1,%r19,0
+ 	comib,<>,n 2,%r19,L$0006
+-L$0057
++	.label L$0057
+ 	ldb -160(0,%r30),%r19
+ 	bl L$0065,0
+ 	extrs %r19,31,8,%r28
+-L$0006
++	.label L$0006
+ 	comib,<>,n 3,%r19,L$0008
+ 	ldb -160(0,%r30),%r28
+ 	bl L$0065,0
+ 	ldw -212(0,%r30),%r2
+-L$0008
++	.label L$0008
+ 	comib,<>,n 4,%r19,L$0010
+ 	ldh -160(0,%r30),%r19
+ 	bl L$0003,0
+ 	extrs %r19,31,16,%r28
+-L$0010
++	.label L$0010
+ 	comib,<>,n 5,%r19,L$0012
+ 	ldh -160(0,%r30),%r28
+ 	bl L$0065,0
+ 	ldw -212(0,%r30),%r2
+-L$0012
++	.label L$0012
+ 	comib,=,n 6,%r19,L$0060
+ 	comib,=,n 7,%r19,L$0060
+ 	comib,=,n 8,%r19,L$0060
+@@ -83,18 +77,18 @@
+ 	comib,<>,n 12,%r19,L$0024
+ 	ldo -152(%r30),%r19
+ 	fldws -8(0,%r19),%fr4L
+-L$0060
++	.label L$0060
+ 	bl L$0003,0
+ 	ldw -160(0,%r30),%r28
+-L$0024
++	.label L$0024
+ 	comib,<>,n 13,%r19,L$0026
+ 	ldo -152(%r30),%r19
+ 	fldds -8(0,%r19),%fr4
+-L$0059
++	.label L$0059
+ 	ldw -160(0,%r30),%r28
+ 	bl L$0003,0
+ 	ldw -156(0,%r30),%r29
+-L$0026
++	.label L$0026
+ 	comiclr,<> 14,%r19,0
+ 	bl,n L$0060,0
+ 	comib,<> 15,%r19,L$0065
+@@ -103,7 +97,7 @@
+ 	bb,>=,n %r19,31,L$0031
+ 	ldw -176(0,%r30),%r28
+ 	bl,n L$0003,0
+-L$0031
++	.label L$0031
+ 	bb,>= %r19,30,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	bb,>= %r19,28,L$0034
+@@ -113,22 +107,22 @@
+ 	ldw -176(0,%r30),%r19
+ 	bl L$0065,0
+ 	ldh 0(0,%r19),%r28
+-L$0037
++	.label L$0037
+ 	comib,<> 4,%r19,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	ldw -176(0,%r30),%r19
+ 	bl L$0065,0
+ 	ldw 0(0,%r19),%r28
+-L$0034
++	.label L$0034
+ 	comib,= 0,%r19,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	comib,<<,n 8,%r19,L$0065
+ 	comib,<>,n 1,%r19,L$0042
+-L$0061
++	.label L$0061
+ 	ldw -176(0,%r30),%r19
+ 	bl L$0003,0
+ 	ldb 0(0,%r19),%r28
+-L$0042
++	.label L$0042
+ 	comib,<>,n 2,%r19,L$0044
+ 	ldw -176(0,%r30),%r19
+ 	ldb 0(0,%r19),%r20
+@@ -136,7 +130,7 @@
+ 	zdep %r20,23,24,%r20
+ 	bl L$0003,0
+ 	or %r20,%r19,%r28
+-L$0044
++	.label L$0044
+ 	comib,<> 3,%r19,L$0046
+ 	ldw -176(0,%r30),%r21
+ 	ldb 0(0,%r21),%r19
+@@ -147,12 +141,12 @@
+ 	or %r19,%r20,%r19
+ 	bl L$0003,0
+ 	or %r19,%r21,%r28
+-L$0046
++	.label L$0046
+ 	comib,= 4,%r19,L$0062
+ 	ldw -176(0,%r30),%r22
+ 	comib,<>,n 5,%r19,L$0050
+ 	ldb 4(0,%r22),%r29
+-L$0062
++	.label L$0062
+ 	ldb 0(0,%r22),%r19
+ 	ldb 1(0,%r22),%r20
+ 	ldb 2(0,%r22),%r21
+@@ -164,7 +158,7 @@
+ 	or %r19,%r21,%r19
+ 	bl L$0003,0
+ 	or %r19,%r20,%r28
+-L$0050
++	.label L$0050
+ 	comib,<> 6,%r19,L$0052
+ 	ldw -176(0,%r30),%r22
+ 	ldb 0(0,%r22),%r19
+@@ -181,7 +175,7 @@
+ 	ldb 5(0,%r22),%r20
+ 	bl L$0063,0
+ 	zdep %r19,23,24,%r19
+-L$0052
++	.label L$0052
+ 	comib,<>,n 7,%r19,L$0054
+ 	ldb 0(0,%r22),%r19
+ 	ldb 1(0,%r22),%r20
+@@ -201,7 +195,7 @@
+ 	or %r19,%r20,%r19
+ 	bl L$0003,0
+ 	or %r19,%r21,%r29
+-L$0054
++	.label L$0054
+ 	comib,<> 8,%r19,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	ldw -176(0,%r30),%r22
+@@ -224,11 +218,11 @@
+ 	or %r19,%r20,%r19
+ 	ldb 7(0,%r22),%r20
+ 	or %r19,%r21,%r19
+-L$0063
++	.label L$0063
+ 	or %r19,%r20,%r29
+-L$0003
++	.label L$0003
+ 	ldw -212(0,%r30),%r2
+-L$0065
++	.label L$0065
+ 	bv 0(%r2)
+ 	ldo -192(%r30),%r30
+ 	.EXIT
+
+--- ffcall-1.8.orig/trampoline/cache-hppa.s
++++ ffcall-1.8/trampoline/cache-hppa.s
+@@ -1,18 +1,12 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT __TR_clear_cache,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR
+-__TR_clear_cache
++	.label __TR_clear_cache
+ 	.PROC
+ 	.CALLINFO FRAME=0,NO_CALLS
+ 	.ENTRY
+--- ffcall-1.8.orig/trampoline/proto-hppa.s
++++ ffcall-1.8/trampoline/proto-hppa.s
+@@ -1,18 +1,12 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT tramp,ENTRY,PRIV_LEV=3,RTNVAL=GR
+-tramp
++	.label tramp
+ 	.PROC
+ 	.CALLINFO FRAME=64,CALLS,SAVE_RP
+ 	.ENTRY
+@@ -35,7 +29,7 @@
+ 	.PROCEND
+ 	.align 4
+ 	.EXPORT jump,ENTRY,PRIV_LEV=3,RTNVAL=GR
+-jump
++	.label jump
+ 	.PROC
+ 	.CALLINFO FRAME=0,NO_CALLS
+ 	.ENTRY
+--- ffcall-1.8.orig/trampoline/tramp-hppa.s
++++ ffcall-1.8/trampoline/tramp-hppa.s
+@@ -9,20 +9,14 @@
+ ; on this software.
+ ;
+ 
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT tramp,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR
+-tramp
++	.label tramp
+ 	.PROC
+ 	.CALLINFO FRAME=0,NO_CALLS
+ 	.ENTRY
+@@ -40,7 +34,7 @@
+ 	depi 0,31,2,%r21
+ 	ldw 4(0,%r21),%r19
+ 	ldw 0(0,%r21),%r21
+-tramp_2
++	.label tramp_2
+ 	ldsid (0,%r21),%r1
+ 	mtsp %r1,%sr0
+ 	be,n 0(%sr0,%r21)
+--- ffcall-1.8.orig/vacall/vacall-hppa.s
++++ ffcall-1.8/vacall/vacall-hppa.s
+@@ -1,19 +1,13 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+ 	.IMPORT vacall_function,DATA
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT vacall,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR
+-vacall
++	.label vacall
+ 	.PROC
+ 	.CALLINFO FRAME=192,CALLS,SAVE_RP
+ 	.ENTRY
+@@ -54,26 +48,26 @@
+ 	ldw -212(0,%r30),%r2
+ 	comiclr,= 1,%r19,0
+ 	comib,<>,n 2,%r19,L$0006
+-L$0057
++	.label L$0057
+ 	ldb -160(0,%r30),%r19
+ 	bl L$0065,0
+ 	extrs %r19,31,8,%r28
+-L$0006
++	.label L$0006
+ 	comib,<>,n 3,%r19,L$0008
+ 	ldb -160(0,%r30),%r28
+ 	bl L$0065,0
+ 	ldw -212(0,%r30),%r2
+-L$0008
++	.label L$0008
+ 	comib,<>,n 4,%r19,L$0010
+ 	ldh -160(0,%r30),%r19
+ 	bl L$0003,0
+ 	extrs %r19,31,16,%r28
+-L$0010
++	.label L$0010
+ 	comib,<>,n 5,%r19,L$0012
+ 	ldh -160(0,%r30),%r28
+ 	bl L$0065,0
+ 	ldw -212(0,%r30),%r2
+-L$0012
++	.label L$0012
+ 	comib,=,n 6,%r19,L$0060
+ 	comib,=,n 7,%r19,L$0060
+ 	comib,=,n 8,%r19,L$0060
+@@ -84,18 +78,18 @@
+ 	comib,<>,n 12,%r19,L$0024
+ 	ldo -152(%r30),%r19
+ 	fldws -8(0,%r19),%fr4L
+-L$0060
++	.label L$0060
+ 	bl L$0003,0
+ 	ldw -160(0,%r30),%r28
+-L$0024
++	.label L$0024
+ 	comib,<>,n 13,%r19,L$0026
+ 	ldo -152(%r30),%r19
+ 	fldds -8(0,%r19),%fr4
+-L$0059
++	.label L$0059
+ 	ldw -160(0,%r30),%r28
+ 	bl L$0003,0
+ 	ldw -156(0,%r30),%r29
+-L$0026
++	.label L$0026
+ 	comiclr,<> 14,%r19,0
+ 	bl,n L$0060,0
+ 	comib,<> 15,%r19,L$0065
+@@ -104,7 +98,7 @@
+ 	bb,>=,n %r19,31,L$0031
+ 	ldw -176(0,%r30),%r28
+ 	bl,n L$0003,0
+-L$0031
++	.label L$0031
+ 	bb,>= %r19,30,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	bb,>= %r19,28,L$0034
+@@ -114,22 +108,22 @@
+ 	ldw -176(0,%r30),%r19
+ 	bl L$0065,0
+ 	ldh 0(0,%r19),%r28
+-L$0037
++	.label L$0037
+ 	comib,<> 4,%r19,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	ldw -176(0,%r30),%r19
+ 	bl L$0065,0
+ 	ldw 0(0,%r19),%r28
+-L$0034
++	.label L$0034
+ 	comib,= 0,%r19,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	comib,<<,n 8,%r19,L$0065
+ 	comib,<>,n 1,%r19,L$0042
+-L$0061
++	.label L$0061
+ 	ldw -176(0,%r30),%r19
+ 	bl L$0003,0
+ 	ldb 0(0,%r19),%r28
+-L$0042
++	.label L$0042
+ 	comib,<>,n 2,%r19,L$0044
+ 	ldw -176(0,%r30),%r19
+ 	ldb 0(0,%r19),%r20
+@@ -137,7 +131,7 @@
+ 	zdep %r20,23,24,%r20
+ 	bl L$0003,0
+ 	or %r20,%r19,%r28
+-L$0044
++	.label L$0044
+ 	comib,<> 3,%r19,L$0046
+ 	ldw -176(0,%r30),%r21
+ 	ldb 0(0,%r21),%r19
+@@ -148,12 +142,12 @@
+ 	or %r19,%r20,%r19
+ 	bl L$0003,0
+ 	or %r19,%r21,%r28
+-L$0046
++	.label L$0046
+ 	comib,= 4,%r19,L$0062
+ 	ldw -176(0,%r30),%r22
+ 	comib,<>,n 5,%r19,L$0050
+ 	ldb 4(0,%r22),%r29
+-L$0062
++	.label L$0062
+ 	ldb 0(0,%r22),%r19
+ 	ldb 1(0,%r22),%r20
+ 	ldb 2(0,%r22),%r21
+@@ -165,7 +159,7 @@
+ 	or %r19,%r21,%r19
+ 	bl L$0003,0
+ 	or %r19,%r20,%r28
+-L$0050
++	.label L$0050
+ 	comib,<> 6,%r19,L$0052
+ 	ldw -176(0,%r30),%r22
+ 	ldb 0(0,%r22),%r19
+@@ -182,7 +176,7 @@
+ 	ldb 5(0,%r22),%r20
+ 	bl L$0063,0
+ 	zdep %r19,23,24,%r19
+-L$0052
++	.label L$0052
+ 	comib,<>,n 7,%r19,L$0054
+ 	ldb 0(0,%r22),%r19
+ 	ldb 1(0,%r22),%r20
+@@ -202,7 +196,7 @@
+ 	or %r19,%r20,%r19
+ 	bl L$0003,0
+ 	or %r19,%r21,%r29
+-L$0054
++	.label L$0054
+ 	comib,<> 8,%r19,L$0065
+ 	ldw -212(0,%r30),%r2
+ 	ldw -176(0,%r30),%r22
+@@ -225,11 +219,11 @@
+ 	or %r19,%r20,%r19
+ 	ldb 7(0,%r22),%r20
+ 	or %r19,%r21,%r19
+-L$0063
++	.label L$0063
+ 	or %r19,%r20,%r29
+-L$0003
++	.label L$0003
+ 	ldw -212(0,%r30),%r2
+-L$0065
++	.label L$0065
+ 	bv 0(%r2)
+ 	ldo -192(%r30),%r30
+ 	.EXIT
+--- ffcall-1.8.orig/callback/trampoline_r/cache-hppa.s
++++ ffcall-1.8/callback/trampoline_r/cache-hppa.s
+@@ -1,18 +1,12 @@
+-	.SPACE $PRIVATE$
+-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
+-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
+-	.SPACE $TEXT$
+-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
+-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
++	.code
+ 	.IMPORT $global$,DATA
+ 	.IMPORT $$dyncall,MILLICODE
+ ; gcc_compiled.:
+-	.SPACE $TEXT$
+-	.SUBSPA $CODE$
++	.code
+ 
+ 	.align 4
+ 	.EXPORT __TR_clear_cache,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR
+-__TR_clear_cache
++	.label __TR_clear_cache
+ 	.PROC
+ 	.CALLINFO FRAME=0,NO_CALLS
+ 	.ENTRY
+
diff --git a/dev-libs/ffcall/files/ffcall_hppa_1.8-4.2.diff.gz b/dev-libs/ffcall/files/ffcall_hppa_1.8-4.2.diff.gz
deleted file mode 100644
index dddc7f7b06cf..000000000000
--- a/dev-libs/ffcall/files/ffcall_hppa_1.8-4.2.diff.gz
+++ /dev/null