diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-04 00:42:11 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-04 00:42:11 +0000 |
commit | b77cbd08abb02d79f2c2959128b72d947a5077dd (patch) | |
tree | ef90a5c83720cf2a645ba200a67248d2a4c0fe9d /sys-freebsd | |
parent | Fixed HOMEPAGE. (diff) | |
download | gentoo-2-b77cbd08abb02d79f2c2959128b72d947a5077dd.tar.gz gentoo-2-b77cbd08abb02d79f2c2959128b72d947a5077dd.tar.bz2 gentoo-2-b77cbd08abb02d79f2c2959128b72d947a5077dd.zip |
Add patch from Emanuele Giaquinta <exg@gentoo.org> to fix building with binutils 2.16.91.0.7.
(Portage version: 2.1_pre7-r3)
Diffstat (limited to 'sys-freebsd')
-rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 7 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-binutils-asm.patch | 36 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-6.0.ebuild | 5 |
3 files changed, 45 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index dc1c3c391fdb..e25026d1c8ff 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.4 2006/04/04 00:42:11 flameeyes Exp $ + + 04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/freebsd-lib-6.0-binutils-asm.patch, freebsd-lib-6.0.ebuild: + Add patch from Emanuele Giaquinta <exg@gentoo.org> to fix building with + binutils 2.16.91.0.7. 02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -files/freebsd-lib-fixmakefiles.patch, diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-binutils-asm.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-binutils-asm.patch new file mode 100644 index 000000000000..f6fdd8350b95 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-binutils-asm.patch @@ -0,0 +1,36 @@ +Update ASM code to build with newer binutils (2.16.91.0.x). Thanks to Emanuele +Giaquinta <exg@gentoo.org> +Index: fbsd-6/lib/libpthread/arch/i386/i386/thr_getcontext.S +=================================================================== +--- fbsd-6.orig/lib/libpthread/arch/i386/i386/thr_getcontext.S ++++ fbsd-6/lib/libpthread/arch/i386/i386/thr_getcontext.S +@@ -63,10 +63,10 @@ ENTRY(__thr_setcontext) + movl $-1, %eax /* bzzzt, invalid context */ + jmp 8f + 2: /*movl 4(%edx), %gs*/ /* we don't touch %gs */ +- movl 8(%edx), %fs +- movl 12(%edx), %es +- movl 16(%edx), %ds +- movl 76(%edx), %ss ++ movw 8(%edx), %fs ++ movw 12(%edx), %es ++ movw 16(%edx), %ds ++ movw 76(%edx), %ss + movl 20(%edx), %edi + movl 24(%edx), %esi + movl 28(%edx), %ebp +@@ -127,10 +127,10 @@ ENTRY(__thr_getcontext) + movl $-1, %eax + jmp 2f + 1: /*movl %gs, 4(%edx)*/ /* we don't touch %gs */ +- movl %fs, 8(%edx) +- movl %es, 12(%edx) +- movl %ds, 16(%edx) +- movl %ss, 76(%edx) ++ movw %fs, 8(%edx) ++ movw %es, 12(%edx) ++ movw %ds, 16(%edx) ++ movw %ss, 76(%edx) + movl %edi, 20(%edx) + movl %esi, 24(%edx) + movl %ebp, 28(%edx) diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.0.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.0.ebuild index edb7c050899e..5bf3d2192c7b 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-6.0.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.0.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-lib/freebsd-lib-6.0.ebuild,v 1.1 2006/04/01 16:43:50 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0.ebuild,v 1.2 2006/04/04 00:42:11 flameeyes Exp $ inherit bsdmk freebsd flag-o-matic toolchain-funcs @@ -60,7 +60,8 @@ PATCHES="${FILESDIR}/${PN}-bsdxml.patch ${FILESDIR}/${PN}-fixmp.patch ${FILESDIR}/${PN}-${RV}-pmc.patch ${FILESDIR}/${PN}-${RV}-gccfloat.patch - ${FILESDIR}/${PN}-${RV}-flex-2.5.31.patch" + ${FILESDIR}/${PN}-${RV}-flex-2.5.31.patch + ${FILESDIR}/${PN}-${RV}-binutils-asm.patch" # Here we disable and remove source which we don't need or want # In order: |