diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-08-21 21:12:16 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-08-21 21:12:16 +0000 |
commit | 39fbfb6cdcf49ed4371f624af61ecce253ee1d27 (patch) | |
tree | 8cf39a83d4f0e51fe8404c3d74965318f999db5b /patches | |
parent | ab8b1ff643d8b898bc52fd7715ce405992e86c1e (diff) | |
download | OSELAS.Toolchain-39fbfb6cdcf49ed4371f624af61ecce253ee1d27.tar.gz OSELAS.Toolchain-39fbfb6cdcf49ed4371f624af61ecce253ee1d27.tar.xz |
* glibc-ports-2.7:
obsolete
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7237 f8d472c7-5700-0410-ac5a-87979cec3adf
Diffstat (limited to 'patches')
8 files changed, 0 insertions, 556 deletions
diff --git a/patches/glibc-ports-2.7/generic/gentoo/6220_all_glibc-2.4-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/patches/glibc-ports-2.7/generic/gentoo/6220_all_glibc-2.4-arm-cirrus-ep93xx-maverick-crunch-fpu.patch deleted file mode 100644 index f5b7582..0000000 --- a/patches/glibc-ports-2.7/generic/gentoo/6220_all_glibc-2.4-arm-cirrus-ep93xx-maverick-crunch-fpu.patch +++ /dev/null @@ -1,388 +0,0 @@ -http://yann.poupet.free.fr/ep93xx/ -Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series - ---- - sysdeps/arm/bits/endian.h | 2 - - sysdeps/arm/fpu/__longjmp.S | 26 +++++++++++++ - sysdeps/arm/fpu/bits/fenv.h | 41 ++++++++++++++++++++ - sysdeps/arm/fpu/bits/setjmp.h | 4 ++ - sysdeps/arm/fpu/fegetround.c | 12 ++++++ - sysdeps/arm/fpu/fesetround.c | 16 ++++++++ - sysdeps/arm/fpu/fpu_control.h | 78 ++++++++++++++++++++++++++++++++++++++- - sysdeps/arm/fpu/jmpbuf-offsets.h | 4 ++ - sysdeps/arm/fpu/setjmp.S | 30 +++++++++++++++ - sysdeps/arm/gccframe.h | 4 ++ - sysdeps/arm/gmp-mparam.h | 2 - - 11 files changed, 216 insertions(+), 3 deletions(-) - -Index: glibc-ports-2.7/sysdeps/arm/bits/endian.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/bits/endian.h -+++ glibc-ports-2.7/sysdeps/arm/bits/endian.h -@@ -12,7 +12,7 @@ - /* FPA floating point units are always big-endian, irrespective of the - CPU endianness. VFP floating point units use the same endianness - as the rest of the system. */ --#ifdef __VFP_FP__ -+#if defined __VFP_FP__ || defined __MAVERICK__ - #define __FLOAT_WORD_ORDER __BYTE_ORDER - #else - #define __FLOAT_WORD_ORDER __BIG_ENDIAN -Index: glibc-ports-2.7/sysdeps/arm/fpu/bits/fenv.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/bits/fenv.h -+++ glibc-ports-2.7/sysdeps/arm/fpu/bits/fenv.h -@@ -20,6 +20,45 @@ - # error "Never use <bits/fenv.h> directly; include <fenv.h> instead." - #endif - -+#if defined(__MAVERICK__) -+ -+/* Define bits representing exceptions in the FPU status word. */ -+enum -+ { -+ FE_INVALID = 1, -+#define FE_INVALID FE_INVALID -+ FE_OVERFLOW = 4, -+#define FE_OVERFLOW FE_OVERFLOW -+ FE_UNDERFLOW = 8, -+#define FE_UNDERFLOW FE_UNDERFLOW -+ FE_INEXACT = 16, -+#define FE_INEXACT FE_INEXACT -+ }; -+ -+/* Amount to shift by to convert an exception to a mask bit. */ -+#define FE_EXCEPT_SHIFT 5 -+ -+/* All supported exceptions. */ -+#define FE_ALL_EXCEPT \ -+ (FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT) -+ -+/* IEEE rounding modes. */ -+enum -+ { -+ FE_TONEAREST = 0, -+#define FE_TONEAREST FE_TONEAREST -+ FE_TOWARDZERO = 0x400, -+#define FE_TOWARDZERO FE_TOWARDZERO -+ FE_DOWNWARD = 0x800, -+#define FE_DOWNWARD FE_DOWNWARD -+ FE_UPWARD = 0xc00, -+#define FE_UPWARD FE_UPWARD -+ }; -+ -+#define FE_ROUND_MASK (FE_UPWARD) -+ -+#else /* FPA */ -+ - /* Define bits representing exceptions in the FPU status word. */ - enum - { -@@ -44,6 +83,8 @@ enum - modes exist, but you have to encode them in the actual instruction. */ - #define FE_TONEAREST 0 - -+#endif -+ - /* Type representing exception flags. */ - typedef unsigned long int fexcept_t; - -Index: glibc-ports-2.7/sysdeps/arm/fpu/bits/setjmp.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/bits/setjmp.h -+++ glibc-ports-2.7/sysdeps/arm/fpu/bits/setjmp.h -@@ -28,7 +28,11 @@ - #ifndef _ASM - /* Jump buffer contains v1-v6, sl, fp, sp and pc. Other registers are not - saved. */ -+#ifdef __MAVERICK__ -+typedef int __jmp_buf[34]; -+#else - typedef int __jmp_buf[22]; - #endif -+#endif - - #endif -Index: glibc-ports-2.7/sysdeps/arm/fpu/jmpbuf-offsets.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/jmpbuf-offsets.h -+++ glibc-ports-2.7/sysdeps/arm/fpu/jmpbuf-offsets.h -@@ -17,4 +17,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define __JMP_BUF_SP 32 -+#else - #define __JMP_BUF_SP 20 -+#endif -Index: glibc-ports-2.7/sysdeps/arm/fpu/fegetround.c -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/fegetround.c -+++ glibc-ports-2.7/sysdeps/arm/fpu/fegetround.c -@@ -18,9 +18,21 @@ - 02111-1307 USA. */ - - #include <fenv.h> -+#include <fpu_control.h> - - int - fegetround (void) - { -+#if defined(__MAVERICK__) -+ -+ unsigned long temp; -+ -+ _FPU_GETCW (temp); -+ return temp & FE_ROUND_MASK; -+ -+#else /* FPA */ -+ - return FE_TONEAREST; /* Easy. :-) */ -+ -+#endif - } -Index: glibc-ports-2.7/sysdeps/arm/fpu/fesetround.c -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/fesetround.c -+++ glibc-ports-2.7/sysdeps/arm/fpu/fesetround.c -@@ -18,12 +18,28 @@ - 02111-1307 USA. */ - - #include <fenv.h> -+#include <fpu_control.h> - - int - fesetround (int round) - { -+#if defined(__MAVERICK__) -+ unsigned long temp; -+ -+ if (round & ~FE_ROUND_MASK) -+ return 1; -+ -+ _FPU_GETCW (temp); -+ temp = (temp & ~FE_ROUND_MASK) | round; -+ _FPU_SETCW (temp); -+ return 0; -+ -+#else /* FPA */ -+ - /* We only support FE_TONEAREST, so there is no need for any work. */ - return (round == FE_TONEAREST)?0:1; -+ -+#endif - } - - libm_hidden_def (fesetround) -Index: glibc-ports-2.7/sysdeps/arm/fpu/fpu_control.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/fpu_control.h -+++ glibc-ports-2.7/sysdeps/arm/fpu/fpu_control.h -@@ -1,5 +1,6 @@ - /* FPU control word definitions. ARM version. -- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1998, 2000, 2005 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -20,6 +21,79 @@ - #ifndef _FPU_CONTROL_H - #define _FPU_CONTROL_H - -+#if defined(__MAVERICK__) -+ -+/* DSPSC register: (from EP9312 User's Guide) -+ * -+ * bits 31..29 - DAID -+ * bits 28..26 - HVID -+ * bits 25..24 - RSVD -+ * bit 23 - ISAT -+ * bit 22 - UI -+ * bit 21 - INT -+ * bit 20 - AEXC -+ * bits 19..18 - SAT -+ * bits 17..16 - FCC -+ * bit 15 - V -+ * bit 14 - FWDEN -+ * bit 13 - Invalid -+ * bit 12 - Denorm -+ * bits 11..10 - RM -+ * bits 9..5 - IXE, UFE, OFE, RSVD, IOE -+ * bits 4..0 - IX, UF, OF, RSVD, IO -+ */ -+ -+/* masking of interrupts */ -+#define _FPU_MASK_IM (1 << 5) /* invalid operation */ -+#define _FPU_MASK_ZM 0 /* divide by zero */ -+#define _FPU_MASK_OM (1 << 7) /* overflow */ -+#define _FPU_MASK_UM (1 << 8) /* underflow */ -+#define _FPU_MASK_PM (1 << 9) /* inexact */ -+#define _FPU_MASK_DM 0 /* denormalized operation */ -+ -+#define _FPU_RESERVED 0xfffff000 /* These bits are reserved. */ -+ -+#define _FPU_DEFAULT 0x00b00000 /* Default value. */ -+#define _FPU_IEEE 0x00b003a0 /* Default + exceptions enabled. */ -+ -+/* Type of the control word. */ -+typedef unsigned int fpu_control_t; -+ -+/* Macros for accessing the hardware control word. */ -+#define _FPU_GETCW(cw) ({ \ -+ register int __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv32sc mvdx0, dspsc\n\t" \ -+ "cfmvr64l %0, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (cw), "=r" (__t1), "=r" (__t2) \ -+ ); \ -+}) -+ -+#define _FPU_SETCW(cw) ({ \ -+ register int __t0, __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %0\n\t" \ -+ "cfmvsc32 dspsc, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (__t0), "=r" (__t1), "=r" (__t2) \ -+ : "0" (cw) \ -+ ); \ -+}) -+ -+/* Default control word set at startup. */ -+extern fpu_control_t __fpu_control; -+ -+#else /* FPA */ -+ - /* We have a slight terminology confusion here. On the ARM, the register - * we're interested in is actually the FPU status word - the FPU control - * word is something different (which is implementation-defined and only -@@ -99,4 +173,6 @@ typedef unsigned int fpu_control_t; - /* Default control word set at startup. */ - extern fpu_control_t __fpu_control; - -+#endif -+ - #endif /* _FPU_CONTROL_H */ -Index: glibc-ports-2.7/sysdeps/arm/fpu/__longjmp.S -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/__longjmp.S -+++ glibc-ports-2.7/sysdeps/arm/fpu/__longjmp.S -@@ -30,7 +30,33 @@ ENTRY (__longjmp) - movs r0, r1 /* get the return value in place */ - moveq r0, #1 /* can't let setjmp() return zero! */ - -+#ifdef __MAVERICK__ -+ cfldrd mvd4, [ip], #8 -+ nop -+ cfldrd mvd5, [ip], #8 -+ nop -+ cfldrd mvd6, [ip], #8 -+ nop -+ cfldrd mvd7, [ip], #8 -+ nop -+ cfldrd mvd8, [ip], #8 -+ nop -+ cfldrd mvd9, [ip], #8 -+ nop -+ cfldrd mvd10, [ip], #8 -+ nop -+ cfldrd mvd11, [ip], #8 -+ nop -+ cfldrd mvd12, [ip], #8 -+ nop -+ cfldrd mvd13, [ip], #8 -+ nop -+ cfldrd mvd14, [ip], #8 -+ nop -+ cfldrd mvd15, [ip], #8 -+#else - lfmfd f4, 4, [ip] ! /* load the floating point regs */ -+#endif - - LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) - END (__longjmp) -Index: glibc-ports-2.7/sysdeps/arm/fpu/setjmp.S -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/fpu/setjmp.S -+++ glibc-ports-2.7/sysdeps/arm/fpu/setjmp.S -@@ -24,11 +24,41 @@ - - ENTRY (__sigsetjmp) - /* Save registers */ -+#ifdef __MAVERICK__ -+ cfstrd mvd4, [r0], #8 -+ nop -+ cfstrd mvd5, [r0], #8 -+ nop -+ cfstrd mvd6, [r0], #8 -+ nop -+ cfstrd mvd7, [r0], #8 -+ nop -+ cfstrd mvd8, [r0], #8 -+ nop -+ cfstrd mvd9, [r0], #8 -+ nop -+ cfstrd mvd10, [r0], #8 -+ nop -+ cfstrd mvd11, [r0], #8 -+ nop -+ cfstrd mvd12, [r0], #8 -+ nop -+ cfstrd mvd13, [r0], #8 -+ nop -+ cfstrd mvd14, [r0], #8 -+ nop -+ cfstrd mvd15, [r0], #8 -+#else - sfmea f4, 4, [r0]! -+#endif - stmia r0, {v1-v6, sl, fp, sp, lr} - - /* Restore pointer to jmp_buf */ -+#ifdef __MAVERICK__ -+ sub r0, r0, #96 -+#else - sub r0, r0, #48 -+#endif - - /* Make a tail call to __sigjmp_save; it takes the same args. */ - B PLTJMP(C_SYMBOL_NAME(__sigjmp_save)) -Index: glibc-ports-2.7/sysdeps/arm/gccframe.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/gccframe.h -+++ glibc-ports-2.7/sysdeps/arm/gccframe.h -@@ -17,6 +17,10 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define FIRST_PSEUDO_REGISTER 43 -+#else - #define FIRST_PSEUDO_REGISTER 27 -+#endif - - #include <sysdeps/generic/gccframe.h> -Index: glibc-ports-2.7/sysdeps/arm/gmp-mparam.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/arm/gmp-mparam.h -+++ glibc-ports-2.7/sysdeps/arm/gmp-mparam.h -@@ -29,7 +29,7 @@ MA 02111-1307, USA. */ - #if defined(__ARMEB__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 1 --#elif defined(__VFP_FP__) -+#elif defined(__VFP_FP__) || defined(__MAVERICK__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 0 - #else diff --git a/patches/glibc-ports-2.7/generic/gentoo/6224_all_glibc-2.7-lowlevellock-includes.patch b/patches/glibc-ports-2.7/generic/gentoo/6224_all_glibc-2.7-lowlevellock-includes.patch deleted file mode 100644 index 4a33972..0000000 --- a/patches/glibc-ports-2.7/generic/gentoo/6224_all_glibc-2.7-lowlevellock-includes.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix building on arm: - -armv4l-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -mcpu=strongarm110 -pipe -Wstrict-prototypes -fPIC -I../include -I/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/armv4l-unknown-linux-gnu/4.1.2/include -isystem /usr/lib/gcc/armv4l-unknown-linux-gnu/4.1.2/include-fixed -isystem /usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DPIC -DSHARED -DNOT_IN_libc=1 -DIS_IN_rtld=1 -o /var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM' -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function) -make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1 - ---- - sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | 1 + - 1 file changed, 1 insertion(+) - -Index: glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -+++ glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -@@ -25,6 +25,7 @@ - #include <atomic.h> - #include <sysdep.h> - #include <kernel-features.h> -+#include <tls.h> - - #define FUTEX_WAIT 0 - #define FUTEX_WAKE 1 diff --git a/patches/glibc-ports-2.7/generic/gentoo/6225_all_glibc-2.7-cargs6.patch b/patches/glibc-ports-2.7/generic/gentoo/6225_all_glibc-2.7-cargs6.patch deleted file mode 100644 index a0d0e93..0000000 --- a/patches/glibc-ports-2.7/generic/gentoo/6225_all_glibc-2.7-cargs6.patch +++ /dev/null @@ -1,31 +0,0 @@ -fix building on arm: - -(echo '#include <sysdep-cancel.h>'; \ - echo 'PSEUDO (splice, splice, 6)'; \ - echo ' ret'; \ - echo 'PSEUDO_END(splice)'; \ - echo 'libc_hidden_def (splice)'; \ - ) | armv4l-unknown-linux-gnu-gcc -c -I../include -I/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/misc -I/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/armv4l-unknown-linux-gnu/4.1.2/include -isystem /usr/lib/gcc/armv4l-unknown-linux-gnu/4.1.2/include-fixed -isystem /usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DASSEMBLER -x assembler-with-cpp -o /var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/misc/splice.o - -<stdin>: Assembler messages: -<stdin>:2: Error: bad instruction `docargs_6' -<stdin>:2: Error: bad instruction `undocargs_6' -make[2]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/misc/splice.o] Error 1 - ---- - sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h | 3 +++ - 1 file changed, 3 insertions(+) - -Index: glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h -+++ glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h -@@ -73,6 +73,9 @@ - # define DOCARGS_5 DOCARGS_4 - # define UNDOCARGS_5 UNDOCARGS_4 - -+# define DOCARGS_6 DOCARGS_5 -+# define UNDOCARGS_6 UNDOCARGS_5 -+ - # ifdef IS_IN_libpthread - # define CENABLE bl PLTJMP(__pthread_enable_asynccancel) - # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel) diff --git a/patches/glibc-ports-2.7/generic/gentoo/6230_all_arm-glibc-2.5-no-page-header.patch b/patches/glibc-ports-2.7/generic/gentoo/6230_all_arm-glibc-2.5-no-page-header.patch deleted file mode 100644 index f8852fc..0000000 --- a/patches/glibc-ports-2.7/generic/gentoo/6230_all_arm-glibc-2.5-no-page-header.patch +++ /dev/null @@ -1,20 +0,0 @@ -2007-03-13 Mike Frysinger <vapier@gentoo.org> - - * sysdeps/unix/sysv/linux/arm/ioperm.c: Don't include asm/page.h. - ---- - sysdeps/unix/sysv/linux/arm/ioperm.c | 1 - - 1 file changed, 1 deletion(-) - -Index: glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/ioperm.c -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/ioperm.c -+++ glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/ioperm.c -@@ -45,7 +45,6 @@ - #include <sys/mman.h> - - #include <linux/version.h> --#include <asm/page.h> - #include <sys/sysctl.h> - - #define PATH_ARM_SYSTYPE "/etc/arm_systype" diff --git a/patches/glibc-ports-2.7/generic/gentoo/6605_all_glibc-2.4-fpu-cw-mips.patch b/patches/glibc-ports-2.7/generic/gentoo/6605_all_glibc-2.4-fpu-cw-mips.patch deleted file mode 100644 index 832e84c..0000000 --- a/patches/glibc-ports-2.7/generic/gentoo/6605_all_glibc-2.4-fpu-cw-mips.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html - ---- - sysdeps/mips/fpu_control.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: glibc-ports-2.7/sysdeps/mips/fpu_control.h -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/mips/fpu_control.h -+++ glibc-ports-2.7/sysdeps/mips/fpu_control.h -@@ -85,7 +85,7 @@ extern fpu_control_t __fpu_control; - #define _FPU_RC_UP 0x2 - #define _FPU_RC_DOWN 0x3 - --#define _FPU_RESERVED 0xfe3c0000 /* Reserved bits in cw */ -+#define _FPU_RESERVED 0xfebc0000 /* Reserved bits in cw */ - - - /* The fdlibm code requires strict IEEE double precision arithmetic, diff --git a/patches/glibc-ports-2.7/generic/glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c b/patches/glibc-ports-2.7/generic/glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c deleted file mode 100644 index ee2a6bf..0000000 --- a/patches/glibc-ports-2.7/generic/glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c +++ /dev/null @@ -1,33 +0,0 @@ ---- - ports/sysdeps/arm/mp_clz_tab.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -Index: glibc-ports-2.7/ports/sysdeps/arm/mp_clz_tab.c -=================================================================== ---- /dev/null -+++ glibc-ports-2.7/ports/sysdeps/arm/mp_clz_tab.c -@@ -0,0 +1,24 @@ -+/* __clz_tab -- support for longlong.h -+ Copyright (C) 2004 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) -+/* Nothing required. */ -+#else -+#include <stdlib/mp_clz_tab.c> -+#endif diff --git a/patches/glibc-ports-2.7/generic/series b/patches/glibc-ports-2.7/generic/series deleted file mode 100644 index 0684074..0000000 --- a/patches/glibc-ports-2.7/generic/series +++ /dev/null @@ -1,9 +0,0 @@ -sysdeps_mips_mips32_Makefile-bootstrap.diff - -glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c - -gentoo/6220_all_glibc-2.4-arm-cirrus-ep93xx-maverick-crunch-fpu.patch -gentoo/6605_all_glibc-2.4-fpu-cw-mips.patch -gentoo/6230_all_arm-glibc-2.5-no-page-header.patch -gentoo/6224_all_glibc-2.7-lowlevellock-includes.patch -gentoo/6225_all_glibc-2.7-cargs6.patch diff --git a/patches/glibc-ports-2.7/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff b/patches/glibc-ports-2.7/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff deleted file mode 100644 index a43709f..0000000 --- a/patches/glibc-ports-2.7/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Subject: Hack around mips args to host-gcc - -originally From: "Steven J dot Hill" <sjhill at realitydiluted dot com> -for Crosstool - -In OSELAS.Toolchain we pass -DBOOTSTRAP_GCC in CC. This patch fixes the -header extraction from the glibc, by not passing mips specific flags to -the HOST compiler. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> - ---- - sysdeps/mips/mips32/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: glibc-ports-2.7/sysdeps/mips/mips32/Makefile -=================================================================== ---- glibc-ports-2.7.orig/sysdeps/mips/mips32/Makefile -+++ glibc-ports-2.7/sysdeps/mips/mips32/Makefile -@@ -1,3 +1,7 @@ -+ifeq ($(filter -DBOOTSTRAP_GCC,$(CC)),) - ifeq ($(filter -mabi=32,$(CC)),) - CC += -mabi=32 - endif -+else -+CC += -D_MIPS_SZPTR=32 -+endif |