Add patch to fix building with binutils 2.16.91.0.x.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 162 insertions, 11 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index ac65344fa195..64aceb06864f 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.4 2006/04/03 23:55:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.5 2006/04/04 08:39:13 flameeyes Exp $
+
+  04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-sources-6.0-asm.patch, freebsd-sources-6.0-r2.ebuild:
+  Add patch to fix building with binutils 2.16.91.0.x.
 
 *freebsd-sources-6.0-r2 (03 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index bdfa1d433976..ea21eab0458c 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff4aa7a41bbf4b141044597c0a637829 ChangeLog 4076
-RMD160 4dd6fee65329fbd5250931839fdf5d3b678cca21 ChangeLog 4076
-SHA256 e34a536003ab71402a5dca0e29717be1069fc34df1cbcd43fd18fa04cfb2e232 ChangeLog 4076
+MD5 67e1ad3430ec233f5e78e10a3a89e0be ChangeLog 4256
+RMD160 5ab2b8453c5c77f6deca2c918be8911a085ae9ba ChangeLog 4256
+SHA256 6f87f1582762586b7b390e6d45c9e0649f7a0bd54f329df73f1486550e8ebcf3 ChangeLog 4256
 MD5 ad048c616ac22cb627fd226084ca33e3 files/SA-06-04-ipfw.patch 637
 RMD160 77e10b9e2148f59bd4a96eafa1f2e39c014d562e files/SA-06-04-ipfw.patch 637
 SHA256 4d7b1a9c39c51e4ef1d30f1af4df5aa77f04ef454821fefdc57060c0d4a5fda3 files/SA-06-04-ipfw.patch 637
@@ -22,6 +22,9 @@ SHA256 33ee98a658ac5abaa8b1d1dea7e53c0e8a47aa11d109c3279defe29c734728ad files/SA
 MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r2 256
 RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r2 256
 SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r2 256
+MD5 d7ba170be5603b2bc377cbd544c82a23 files/freebsd-sources-6.0-asm.patch 4172
+RMD160 7872cbedbbe9fbead0d69f26674489b335317606 files/freebsd-sources-6.0-asm.patch 4172
+SHA256 2431b2dae991eef15c00c3e19ac01e23e374a1e8e6992053e64486032631b52e files/freebsd-sources-6.0-asm.patch 4172
 MD5 cc7f31d9d11f552a06379d58f076a154 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 RMD160 a93341cfba5ddbd8df777273591ce21164f3ed41 files/freebsd-sources-6.0-flex-2.5.31.patch 826
 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 files/freebsd-sources-6.0-flex-2.5.31.patch 826
@@ -31,16 +34,16 @@ SHA256 16a6e168c993a64e4000bab47e3ba6c09e727198025422b3c89d52e88ceca76f files/fr
 MD5 4330b108279af439a1b22dbaabe7976f files/freebsd-sources-gentoo.patch 1750
 RMD160 220e9fc91fa2691889792d812ba64fea5e90b411 files/freebsd-sources-gentoo.patch 1750
 SHA256 cf488cd530f1e49c80296937939024eb7cca09666325f3232af186cf376119bb files/freebsd-sources-gentoo.patch 1750
-MD5 1c00dbb4a38442236ab384df69a1dd03 freebsd-sources-6.0-r2.ebuild 1692
-RMD160 538d67979b1c2cc65ad15b34fe34ad12b0a76286 freebsd-sources-6.0-r2.ebuild 1692
-SHA256 dd208ba83930767e525d1dd0f9fe88f5836556b326b063ef748229ad3e1f5073 freebsd-sources-6.0-r2.ebuild 1692
+MD5 45912ec35a43381bf7ebecf7e68afdb8 freebsd-sources-6.0-r2.ebuild 1729
+RMD160 fcf60307cd6c2e5155cbaca3f5d89e45a2801011 freebsd-sources-6.0-r2.ebuild 1729
+SHA256 777caf77cd95e803740efe26fa19ee819c671561abbbd3884b157998bbb06aa1 freebsd-sources-6.0-r2.ebuild 1729
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEMbYrAiZjviIA2XgRArS7AJwP72FTsPyiOTG6X1v1KcBRx6YSHwCfa+rr
-WG46ilScNdBArgSr+xEo9x0=
-=toJL
+iD8DBQFEMjC/AiZjviIA2XgRAlkLAJ9K8IBXMLfI/9JRIYZ5xPB6DxkyngCdG3yt
+k9u30qBFr6C7Dy8RsXgZJf8=
+=Ap2A
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-asm.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-asm.patch
new file mode 100644
index 000000000000..46181bff568e
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-asm.patch
@@ -0,0 +1,143 @@
+Index: fbsd-6/sys/i386/i386/locore.s
+===================================================================
+--- fbsd-6.orig/sys/i386/i386/locore.s
++++ fbsd-6/sys/i386/i386/locore.s
+@@ -358,7 +358,7 @@ NON_GPROF_ENTRY(sigcode)
+ 	pushl	%eax
+ 	testl	$PSL_VM,UC_EFLAGS(%eax)
+ 	jne	1f
+-	movl	UC_GS(%eax),%gs		/* restore %gs */
++	movw	UC_GS(%eax),%gs		/* restore %gs */
+ 1:
+ 	movl	$SYS_sigreturn,%eax
+ 	pushl	%eax			/* junk to fake return addr. */
+@@ -375,7 +375,7 @@ freebsd4_sigcode:
+ 	pushl	%eax
+ 	testl	$PSL_VM,UC4_EFLAGS(%eax)
+ 	jne	1f
+-	movl	UC4_GS(%eax),%gs	/* restore %gs */
++	movw	UC4_GS(%eax),%gs	/* restore %gs */
+ 1:
+ 	movl	$344,%eax		/* 4.x SYS_sigreturn */
+ 	pushl	%eax			/* junk to fake return addr. */
+@@ -393,7 +393,7 @@ osigcode:
+ 	pushl	%eax
+ 	testl	$PSL_VM,SC_PS(%eax)
+ 	jne	9f
+-	movl	SC_GS(%eax),%gs		/* restore %gs */
++	movw	SC_GS(%eax),%gs		/* restore %gs */
+ 9:
+ 	movl	$103,%eax		/* 3.x SYS_sigreturn */
+ 	pushl	%eax			/* junk to fake return addr. */
+Index: fbsd-6/sys/i386/include/cpufunc.h
+===================================================================
+--- fbsd-6.orig/sys/i386/include/cpufunc.h
++++ fbsd-6/sys/i386/include/cpufunc.h
+@@ -452,7 +452,7 @@ static __inline u_int
+ rfs(void)
+ {
+ 	u_int sel;
+-	__asm __volatile("movl %%fs,%0" : "=rm" (sel));
++	__asm __volatile("movw %%fs,%0" : "=rm" (sel));
+ 	return (sel);
+ }
+ 
+@@ -460,7 +460,7 @@ static __inline u_int
+ rgs(void)
+ {
+ 	u_int sel;
+-	__asm __volatile("movl %%gs,%0" : "=rm" (sel));
++	__asm __volatile("movw %%gs,%0" : "=rm" (sel));
+ 	return (sel);
+ }
+ 
+@@ -468,20 +468,20 @@ static __inline u_int
+ rss(void)
+ {
+ 	u_int sel;
+-	__asm __volatile("movl %%ss,%0" : "=rm" (sel));
++	__asm __volatile("movw %%ss,%0" : "=rm" (sel));
+ 	return (sel);
+ }
+ 
+ static __inline void
+ load_fs(u_int sel)
+ {
+-	__asm __volatile("movl %0,%%fs" : : "rm" (sel));
++	__asm __volatile("movw %0,%%fs" : : "rm" (sel));
+ }
+ 
+ static __inline void
+ load_gs(u_int sel)
+ {
+-	__asm __volatile("movl %0,%%gs" : : "rm" (sel));
++	__asm __volatile("movw %0,%%gs" : : "rm" (sel));
+ }
+ 
+ static __inline void
+Index: fbsd-6/sys/i386/i386/swtch.s
+===================================================================
+--- fbsd-6.orig/sys/i386/i386/swtch.s
++++ fbsd-6/sys/i386/i386/swtch.s
+@@ -111,7 +111,7 @@ ENTRY(cpu_switch)
+ 	movl	%ebp,PCB_EBP(%edx)
+ 	movl	%esi,PCB_ESI(%edx)
+ 	movl	%edi,PCB_EDI(%edx)
+-	movl	%gs,PCB_GS(%edx)
++	movw	%gs,PCB_GS(%edx)
+ 	pushfl					/* PSL */
+ 	popl	PCB_PSL(%edx)
+ 	/* Check to see if we need to call a switchout function. */
+@@ -279,7 +279,7 @@ sw1:
+ 	/* This must be done after loading the user LDT. */
+ 	.globl	cpu_switch_load_gs
+ cpu_switch_load_gs:
+-	movl	PCB_GS(%edx),%gs
++	movw	PCB_GS(%edx),%gs
+ 
+ 	/* Test if debug registers should be restored. */
+ 	testl	$PCB_DBREGS,PCB_FLAGS(%edx)
+@@ -348,7 +348,7 @@ ENTRY(savectx)
+ 	movl	%ebp,PCB_EBP(%ecx)
+ 	movl	%esi,PCB_ESI(%ecx)
+ 	movl	%edi,PCB_EDI(%ecx)
+-	movl	%gs,PCB_GS(%ecx)
++	movw	%gs,PCB_GS(%ecx)
+ 	pushfl
+ 	popl	PCB_PSL(%ecx)
+ 
+Index: fbsd-6/sys/compat/ndis/winx32_wrap.S
+===================================================================
+--- fbsd-6.orig/sys/compat/ndis/winx32_wrap.S
++++ fbsd-6/sys/compat/ndis/winx32_wrap.S
+@@ -364,7 +364,7 @@ ENTRY(x86_getfs)
+ 	ret
+ 
+ ENTRY(x86_setfs)
+-	movl	4(%esp),%fs
++	movw	4(%esp),%fs
+ 	ret
+ 
+ ENTRY(x86_gettid)
+Index: fbsd-6/sys/i386/linux/linux_locore.s
+===================================================================
+--- fbsd-6.orig/sys/i386/linux/linux_locore.s
++++ fbsd-6/sys/i386/linux/linux_locore.s
+@@ -8,7 +8,7 @@
+ NON_GPROF_ENTRY(linux_sigcode)
+ 	call	*LINUX_SIGF_HANDLER(%esp)
+ 	leal	LINUX_SIGF_SC(%esp),%ebx	/* linux scp */
+-	movl	LINUX_SC_GS(%ebx),%gs
++	movw	LINUX_SC_GS(%ebx),%gs
+ 	movl	%esp, %ebx			/* pass sigframe */
+ 	push	%eax				/* fake ret addr */
+ 	movl	$LINUX_SYS_linux_sigreturn,%eax	/* linux_sigreturn() */
+@@ -19,7 +19,7 @@ NON_GPROF_ENTRY(linux_sigcode)
+ linux_rt_sigcode:
+ 	call	*LINUX_RT_SIGF_HANDLER(%esp)
+ 	leal	LINUX_RT_SIGF_UC(%esp),%ebx	/* linux ucp */
+-	movl	LINUX_SC_GS(%ebx),%gs
++	movw	LINUX_SC_GS(%ebx),%gs
+ 	push	%eax				/* fake ret addr */
+ 	movl	$LINUX_SYS_linux_rt_sigreturn,%eax   /* linux_rt_sigreturn() */
+ 	int	$0x80				/* enter kernel with args */
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild
index 9fbb5242cf3f..6f1bdc8df24e 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild,v 1.1 2006/04/03 23:55:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild,v 1.2 2006/04/04 08:39:13 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd ${S}
 	epatch "${FILESDIR}/${PN}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-flex-2.5.31.patch"
+	epatch "${FILESDIR}/${P}-asm.patch"
 
 	epatch "${FILESDIR}/SA-06-04-ipfw.patch"
 	epatch "${FILESDIR}/SA-06-05-80211.patch"