diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-04-27 17:57:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-04-27 17:57:35 +0000 |
| commit | 94696cb668b80acd1f59731b938c1cc13608c9f2 (patch) | |
| tree | 695fc204d3f98b13b40a538b6c775a11dbdbe324 /sys-libs/glibc | |
| parent | PPC stable profile update (diff) | |
| download | historical-94696cb668b80acd1f59731b938c1cc13608c9f2.tar.gz historical-94696cb668b80acd1f59731b938c1cc13608c9f2.tar.bz2 historical-94696cb668b80acd1f59731b938c1cc13608c9f2.zip | |
back off one of the arm patches
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-arm-doargs.patch | 17 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.2-r10.ebuild | 7 |
2 files changed, 2 insertions, 22 deletions
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-arm-doargs.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-arm-doargs.patch deleted file mode 100644 index a06336ff88a0..000000000000 --- a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-arm-doargs.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h.orig 2003-05-27 20:25:22.000000000 -0400 -+++ linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h 2003-05-27 20:07:12.000000000 -0400 -@@ -26,12 +26,14 @@ - - /* We push lr onto the stack, so we have to use ldmib instead of ldmia - to find the saved arguments. */ -+#ifdef PIC - #undef DOARGS_5 - #undef DOARGS_6 - #undef DOARGS_7 - #define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8]; - #define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5}; - #define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6}; -+#endif /* PIC */ - - # undef PSEUDO_RET - # define PSEUDO_RET \ diff --git a/sys-libs/glibc/glibc-2.3.2-r10.ebuild b/sys-libs/glibc/glibc-2.3.2-r10.ebuild index 693933b8b4c2..08b2a4edff4f 100644 --- a/sys-libs/glibc/glibc-2.3.2-r10.ebuild +++ b/sys-libs/glibc/glibc-2.3.2-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r10.ebuild,v 1.10 2004/04/27 04:46:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r10.ebuild,v 1.11 2004/04/27 17:57:35 vapier Exp $ IUSE="nls pic build nptl" @@ -417,11 +417,8 @@ src_unpack() { epatch ${FILESDIR}/2.3.2/${P}-framestate-USING_SJLJ_EXCEPTIONS.patch # BUS_ISA is needed in ioperm.c but is defined in linux/input.h epatch ${FILESDIR}/2.3.2/${P}-arm-bus-defines.patch - # these patches are taken from netwinder.org glibc rpm - # armformat fixes the linker script creation - # arm-doargs creates certain defines only when pic is used + # armformat fixes the linker script creation (taken from netwinder.org glibc rpm) epatch ${FILESDIR}/2.3.2/${P}-armformat.patch - epatch ${FILESDIR}/2.3.2/${P}-arm-doargs.patch fi # Fix permissions on some of the scripts |