diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 18:55:40 +0100 |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 18:55:40 +0100 |
commit | 4fb0c302e0809c1f88a8573e87ce46da1d821a8f (patch) | |
tree | 1ad0516974250ddbca813e9d6cfabe9217eb93b1 /patches/uClibc | |
parent | 288173ce56309b762c11d0e8c11d18c828ed14bc (diff) | |
download | crosstool-ng-4fb0c302e0809c1f88a8573e87ce46da1d821a8f.tar.gz crosstool-ng-4fb0c302e0809c1f88a8573e87ce46da1d821a8f.tar.bz2 crosstool-ng-4fb0c302e0809c1f88a8573e87ce46da1d821a8f.zip |
config: rip-out versions marked as OBSOLETE
Diffstat (limited to 'patches/uClibc')
23 files changed, 0 insertions, 1239 deletions
diff --git a/patches/uClibc/0.9.28.1/100-string-functions.patch b/patches/uClibc/0.9.28.1/100-string-functions.patch deleted file mode 100644 index ab6c2553..00000000 --- a/patches/uClibc/0.9.28.1/100-string-functions.patch +++ /dev/null @@ -1,14 +0,0 @@ -Give preference to target-optimised functions over glibc's ones, -which in turn ahave precedence over generic ones. - ---- uClibc.orig/libc/Makefile 2005-07-20 08:10:44.000000000 +0200 -+++ uclibc/libc/Makefile 2005-07-28 13:33:40.000000000 +0200 -@@ -59,7 +59,7 @@ - $(AR) dN 2 $(LIBNAME) $$objs && \ - $(AR) dN 2 $(LIBNAME) $$objs - @for objfile in obj.signal \ -- obj.string.generic obj.string.$(TARGET_ARCH) obj.string \ -+ obj.string obj.string.generic obj.string.$(TARGET_ARCH) \ - obj.sysdeps.common obj.sysdeps.$(TARGET_ARCH) ; do \ - if [ -e $$objfile ] ; then \ - echo $(AR) $(ARFLAGS) $(LIBNAME) $$objfile ; \ diff --git a/patches/uClibc/0.9.28.1/110-install_dev.patch b/patches/uClibc/0.9.28.1/110-install_dev.patch deleted file mode 100644 index 2fefe83e..00000000 --- a/patches/uClibc/0.9.28.1/110-install_dev.patch +++ /dev/null @@ -1,22 +0,0 @@ -We know that the kernel headers are in place. Don't try to install them. - -diff -dur uClibc-0.9.28.1.orig/Makefile uClibc-0.9.28.1/Makefile ---- uClibc-0.9.28.1.orig/Makefile 2007-01-28 06:38:00.000000000 +0100 -+++ uClibc-0.9.28.1/Makefile 2007-01-28 18:55:46.000000000 +0100 -@@ -158,12 +158,10 @@ - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include - -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ -- if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \ -- extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ -- else \ -- extra_exclude="" ; \ -- fi ; \ -- tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \ -+ extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ -+ tar -chf - include --exclude .svn --exclude CVS \ -+ --exclude include/linux \ -+ --exclude include/asm'*' \ - | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) - ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y) - # Remove floating point related headers since float support is disabled. diff --git a/patches/uClibc/0.9.28.1/120-no_LFS-no_readahead.patch b/patches/uClibc/0.9.28.1/120-no_LFS-no_readahead.patch deleted file mode 100644 index ca0568ca..00000000 --- a/patches/uClibc/0.9.28.1/120-no_LFS-no_readahead.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/common/Makefile uClibc-0.9.28.1/libc/sysdeps/linux/common/Makefile ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/common/Makefile 2007-01-26 00:54:19.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/common/Makefile 2007-02-01 08:44:37.000000000 +0100 -@@ -25,6 +25,10 @@ - SRCS := $(filter-out sbrk.c,$(SRCS)) - endif - -+ifneq ($(strip $(UCLIBC_HAS_LFS)),y) -+SRCS := $(filter-out readahead.c,$(SRCS)) -+endif -+ - ifneq ($(strip $(UCLIBC_HAS_SSP)),y) - SRCS := $(filter-out ssp.c,$(SRCS)) - endif diff --git a/patches/uClibc/0.9.28.1/130-time-locale.patch b/patches/uClibc/0.9.28.1/130-time-locale.patch deleted file mode 100644 index f449ad6a..00000000 --- a/patches/uClibc/0.9.28.1/130-time-locale.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: libc/misc/time/time.c -=================================================================== ---- a/libc/misc/time/time.c (revision 17534) -+++ b/libc/misc/time/time.c (revision 17647) -@@ -158,7 +158,9 @@ - #endif - - #if defined (L_tzset) || defined (L_localtime_r) || defined(L_strftime) || \ -- defined(L__time_mktime) || defined(L__time_mktime_tzi) -+ defined(L__time_mktime) || defined(L__time_mktime_tzi) || \ -+ ((defined(L_strftime) || defined(L_strftime_l)) && \ -+ defined(__UCLIBC_HAS_XLOCALE__)) - - void _time_tzset (int); - diff --git a/patches/uClibc/0.9.28.1/140-ctype.patch b/patches/uClibc/0.9.28.1/140-ctype.patch deleted file mode 100644 index b07ccdb9..00000000 --- a/patches/uClibc/0.9.28.1/140-ctype.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h ---- uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h Fri Jun 3 13:30:25 2005 -+++ uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h Fri Jun 3 13:30:39 2005 -@@ -34,11 +34,11 @@ - - /* glibc uses the equivalent of - typedef __int32_t __ctype_touplow_t; */ - --typedef __uint16_t __ctype_mask_t; -+typedef __uint32_t __ctype_mask_t; - - #ifdef __UCLIBC_HAS_CTYPE_SIGNED__ - --typedef __int16_t __ctype_touplow_t; -+typedef __int32_t __ctype_touplow_t; - #define __UCLIBC_CTYPE_B_TBL_OFFSET 128 - #define __UCLIBC_CTYPE_TO_TBL_OFFSET 128 - diff --git a/patches/uClibc/0.9.28.1/150-custom-ISA.patch b/patches/uClibc/0.9.28.1/150-custom-ISA.patch deleted file mode 100644 index 2cc9bcb5..00000000 --- a/patches/uClibc/0.9.28.1/150-custom-ISA.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -dur uClibc-0.9.28.orig/Rules.mak uClibc-0.9.28/Rules.mak ---- uClibc-0.9.28.orig/Rules.mak 2005-08-18 00:49:49.000000000 +0200 -+++ uClibc-0.9.28/Rules.mak 2007-01-30 10:53:34.000000000 +0100 -@@ -168,6 +168,7 @@ - CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32 -+ CPU_CFLAGS-$(CONFIG_MIPS_ISA_CUSTOM)+=-march=$(CONFIG_MIPS_CPU_CFLAGS_CUSTOM) - endif - - ifeq ($(strip $(TARGET_ARCH)),sh) -diff -dur uClibc-0.9.28.orig/extra/Configs/Config.mips uClibc-0.9.28/extra/Configs/Config.mips ---- uClibc-0.9.28.orig/extra/Configs/Config.mips 2005-08-18 00:49:41.000000000 +0200 -+++ uClibc-0.9.28/extra/Configs/Config.mips 2007-01-30 10:52:12.000000000 +0100 -@@ -63,4 +63,16 @@ - config CONFIG_MIPS_ISA_MIPS64 - bool "MIPS64" - -+config CONFIG_MIPS_ISA_CUSTOM -+ bool "Custom" -+ - endchoice -+ -+config CONFIG_MIPS_CPU_CFLAGS_CUSTOM -+ string -+ prompt "Custon ISA" -+ depends on CONFIG_MIPS_ISA_CUSTOM -+ default "" -+ help -+ Enter your custom ISA here (eg: lx4189!). -+ diff --git a/patches/uClibc/0.9.28.1/160-mips-asm.h.patch b/patches/uClibc/0.9.28.1/160-mips-asm.h.patch deleted file mode 100644 index 285feed7..00000000 --- a/patches/uClibc/0.9.28.1/160-mips-asm.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S 2007-02-07 10:41:34.000000000 +0100 -@@ -24,7 +24,7 @@ - #include <sys/regdef.h> - #define _ERRNO_H 1 - #include <bits/errno.h> --#include <asm/asm.h> -+#include <sys/asm.h> - - /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */ - -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S 2007-02-07 11:16:52.000000000 +0100 -@@ -3,9 +3,9 @@ - /*see uClibc's sh/pipe.c and glibc-2.2.4's mips/pipe.S */ - - #include <features.h> --#include <asm/asm.h> -+#include <sys/asm.h> - #include <asm/unistd.h> --#include <asm/regdef.h> -+#include <sys/regdef.h> - - .globl pipe - .ent pipe, 0 -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S 2007-02-07 11:17:03.000000000 +0100 -@@ -17,8 +17,8 @@ - 02111-1307 USA. */ - - #include <features.h> --#include <asm/asm.h> --#include <asm/regdef.h> -+#include <sys/asm.h> -+#include <sys/regdef.h> - - #ifdef __PIC__ - .option pic2 diff --git a/patches/uClibc/0.9.28.2/100-string-functions.patch b/patches/uClibc/0.9.28.2/100-string-functions.patch deleted file mode 100644 index ab6c2553..00000000 --- a/patches/uClibc/0.9.28.2/100-string-functions.patch +++ /dev/null @@ -1,14 +0,0 @@ -Give preference to target-optimised functions over glibc's ones, -which in turn ahave precedence over generic ones. - ---- uClibc.orig/libc/Makefile 2005-07-20 08:10:44.000000000 +0200 -+++ uclibc/libc/Makefile 2005-07-28 13:33:40.000000000 +0200 -@@ -59,7 +59,7 @@ - $(AR) dN 2 $(LIBNAME) $$objs && \ - $(AR) dN 2 $(LIBNAME) $$objs - @for objfile in obj.signal \ -- obj.string.generic obj.string.$(TARGET_ARCH) obj.string \ -+ obj.string obj.string.generic obj.string.$(TARGET_ARCH) \ - obj.sysdeps.common obj.sysdeps.$(TARGET_ARCH) ; do \ - if [ -e $$objfile ] ; then \ - echo $(AR) $(ARFLAGS) $(LIBNAME) $$objfile ; \ diff --git a/patches/uClibc/0.9.28.2/110-install_dev.patch b/patches/uClibc/0.9.28.2/110-install_dev.patch deleted file mode 100644 index 4b424678..00000000 --- a/patches/uClibc/0.9.28.2/110-install_dev.patch +++ /dev/null @@ -1,22 +0,0 @@ -We know that the kernel headers are in place. Don't try to install them. - -diff -dur uClibc-0.9.28.1.orig/Makefile uClibc-0.9.28.1/Makefile ---- uClibc-0.9.28.1.orig/Makefile 2007-01-28 06:38:00.000000000 +0100 -+++ uClibc-0.9.28.1/Makefile 2007-01-28 18:55:46.000000000 +0100 -@@ -158,12 +158,10 @@ - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include - -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ -- if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \ -- extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ -- else \ -- extra_exclude="" ; \ -- fi ; \ -- tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \ -+ extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ -+ tar -chf - include --exclude .svn --exclude CVS \ -+ --exclude include/linux \ -+ --exclude include/asm'*' \ - | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) - echo '/* Dont use _syscall#() macros; use the syscall() function */' > \ - $(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h diff --git a/patches/uClibc/0.9.28.2/120-no_LFS-no_readahead.patch b/patches/uClibc/0.9.28.2/120-no_LFS-no_readahead.patch deleted file mode 100644 index ca0568ca..00000000 --- a/patches/uClibc/0.9.28.2/120-no_LFS-no_readahead.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/common/Makefile uClibc-0.9.28.1/libc/sysdeps/linux/common/Makefile ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/common/Makefile 2007-01-26 00:54:19.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/common/Makefile 2007-02-01 08:44:37.000000000 +0100 -@@ -25,6 +25,10 @@ - SRCS := $(filter-out sbrk.c,$(SRCS)) - endif - -+ifneq ($(strip $(UCLIBC_HAS_LFS)),y) -+SRCS := $(filter-out readahead.c,$(SRCS)) -+endif -+ - ifneq ($(strip $(UCLIBC_HAS_SSP)),y) - SRCS := $(filter-out ssp.c,$(SRCS)) - endif diff --git a/patches/uClibc/0.9.28.2/130-ctype.patch b/patches/uClibc/0.9.28.2/130-ctype.patch deleted file mode 100644 index b07ccdb9..00000000 --- a/patches/uClibc/0.9.28.2/130-ctype.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h ---- uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h Fri Jun 3 13:30:25 2005 -+++ uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h Fri Jun 3 13:30:39 2005 -@@ -34,11 +34,11 @@ - - /* glibc uses the equivalent of - typedef __int32_t __ctype_touplow_t; */ - --typedef __uint16_t __ctype_mask_t; -+typedef __uint32_t __ctype_mask_t; - - #ifdef __UCLIBC_HAS_CTYPE_SIGNED__ - --typedef __int16_t __ctype_touplow_t; -+typedef __int32_t __ctype_touplow_t; - #define __UCLIBC_CTYPE_B_TBL_OFFSET 128 - #define __UCLIBC_CTYPE_TO_TBL_OFFSET 128 - diff --git a/patches/uClibc/0.9.28.2/140-custom-ISA.patch b/patches/uClibc/0.9.28.2/140-custom-ISA.patch deleted file mode 100644 index 2cc9bcb5..00000000 --- a/patches/uClibc/0.9.28.2/140-custom-ISA.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -dur uClibc-0.9.28.orig/Rules.mak uClibc-0.9.28/Rules.mak ---- uClibc-0.9.28.orig/Rules.mak 2005-08-18 00:49:49.000000000 +0200 -+++ uClibc-0.9.28/Rules.mak 2007-01-30 10:53:34.000000000 +0100 -@@ -168,6 +168,7 @@ - CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32 -+ CPU_CFLAGS-$(CONFIG_MIPS_ISA_CUSTOM)+=-march=$(CONFIG_MIPS_CPU_CFLAGS_CUSTOM) - endif - - ifeq ($(strip $(TARGET_ARCH)),sh) -diff -dur uClibc-0.9.28.orig/extra/Configs/Config.mips uClibc-0.9.28/extra/Configs/Config.mips ---- uClibc-0.9.28.orig/extra/Configs/Config.mips 2005-08-18 00:49:41.000000000 +0200 -+++ uClibc-0.9.28/extra/Configs/Config.mips 2007-01-30 10:52:12.000000000 +0100 -@@ -63,4 +63,16 @@ - config CONFIG_MIPS_ISA_MIPS64 - bool "MIPS64" - -+config CONFIG_MIPS_ISA_CUSTOM -+ bool "Custom" -+ - endchoice -+ -+config CONFIG_MIPS_CPU_CFLAGS_CUSTOM -+ string -+ prompt "Custon ISA" -+ depends on CONFIG_MIPS_ISA_CUSTOM -+ default "" -+ help -+ Enter your custom ISA here (eg: lx4189!). -+ diff --git a/patches/uClibc/0.9.28.2/150-mips-asm.h.patch b/patches/uClibc/0.9.28.2/150-mips-asm.h.patch deleted file mode 100644 index 285feed7..00000000 --- a/patches/uClibc/0.9.28.2/150-mips-asm.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S 2007-02-07 10:41:34.000000000 +0100 -@@ -24,7 +24,7 @@ - #include <sys/regdef.h> - #define _ERRNO_H 1 - #include <bits/errno.h> --#include <asm/asm.h> -+#include <sys/asm.h> - - /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */ - -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S 2007-02-07 11:16:52.000000000 +0100 -@@ -3,9 +3,9 @@ - /*see uClibc's sh/pipe.c and glibc-2.2.4's mips/pipe.S */ - - #include <features.h> --#include <asm/asm.h> -+#include <sys/asm.h> - #include <asm/unistd.h> --#include <asm/regdef.h> -+#include <sys/regdef.h> - - .globl pipe - .ent pipe, 0 -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S 2007-02-07 11:17:03.000000000 +0100 -@@ -17,8 +17,8 @@ - 02111-1307 USA. */ - - #include <features.h> --#include <asm/asm.h> --#include <asm/regdef.h> -+#include <sys/asm.h> -+#include <sys/regdef.h> - - #ifdef __PIC__ - .option pic2 diff --git a/patches/uClibc/0.9.28/100-string-functions.patch b/patches/uClibc/0.9.28/100-string-functions.patch deleted file mode 100644 index 4436bfe1..00000000 --- a/patches/uClibc/0.9.28/100-string-functions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- uClibc.orig/libc/Makefile 2005-07-20 08:10:44.000000000 +0200 -+++ uclibc/libc/Makefile 2005-07-28 13:33:40.000000000 +0200 -@@ -59,7 +59,7 @@ - $(AR) dN 2 $(LIBNAME) $$objs && \ - $(AR) dN 2 $(LIBNAME) $$objs - @for objfile in obj.signal \ -- obj.string.generic obj.string.$(TARGET_ARCH) obj.string \ -+ obj.string obj.string.generic obj.string.$(TARGET_ARCH) \ - obj.sysdeps.common obj.sysdeps.$(TARGET_ARCH) ; do \ - if [ -e $$objfile ] ; then \ - echo $(AR) $(ARFLAGS) $(LIBNAME) $$objfile ; \ diff --git a/patches/uClibc/0.9.28/110-install_dev.patch b/patches/uClibc/0.9.28/110-install_dev.patch deleted file mode 100644 index 476525be..00000000 --- a/patches/uClibc/0.9.28/110-install_dev.patch +++ /dev/null @@ -1,39 +0,0 @@ -There are at least three weird glitches in the Makefile: - - the test operator is a dual-equal sign (==) when it should be a single one (=); - - the exclude options are not accepted as is by GNU tar; - - how on earth could KERNEL_SOURCE possibly be equal to DEVEL_PREFIX ??? - -We (Cedric DUVAL and I, Yann E. MORIN) are not quite sure why it is that way. -We're not quite sure either on how to solve this. - -What we need is to built a toolchain; in no way we need to install the linux headers. - ==> systematically exclude them from the [s]tar command. - -This patch is inspired by the svn repository of uClibc as of 20060209. -diff -dur /home/ymorin/dev/uClibc-0.9.28/Makefile uClibc-0.9.28/Makefile ---- /home/ymorin/dev/uClibc-0.9.28/Makefile 2005-08-18 00:49:49.000000000 +0200 -+++ uClibc-0.9.28/Makefile 2006-02-09 17:06:58.000000000 +0100 -@@ -158,12 +158,17 @@ - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include - -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ -- if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \ -- extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ -- else \ -- extra_exclude="" ; \ -- fi ; \ -- tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \ -+# if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \ -+# extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ -+# else \ -+# extra_exclude="" ; \ -+# fi ; \ -+# tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \ -+# | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) -+ printf ".svn\n.cvsignore\nCVS\n" > tar_exclude ; \ -+ ls -1d include/linux include/asm* >> tar_exclude ; \ -+ tar -chf - -X tar_exclude include \ - | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) -+ rm -f tar_exclude - ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y) - # Remove floating point related headers since float support is disabled. diff --git a/patches/uClibc/0.9.28/120-no_LFS-no_readahead.patch b/patches/uClibc/0.9.28/120-no_LFS-no_readahead.patch deleted file mode 100644 index ca0568ca..00000000 --- a/patches/uClibc/0.9.28/120-no_LFS-no_readahead.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/common/Makefile uClibc-0.9.28.1/libc/sysdeps/linux/common/Makefile ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/common/Makefile 2007-01-26 00:54:19.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/common/Makefile 2007-02-01 08:44:37.000000000 +0100 -@@ -25,6 +25,10 @@ - SRCS := $(filter-out sbrk.c,$(SRCS)) - endif - -+ifneq ($(strip $(UCLIBC_HAS_LFS)),y) -+SRCS := $(filter-out readahead.c,$(SRCS)) -+endif -+ - ifneq ($(strip $(UCLIBC_HAS_SSP)),y) - SRCS := $(filter-out ssp.c,$(SRCS)) - endif diff --git a/patches/uClibc/0.9.28/130-ctype.patch b/patches/uClibc/0.9.28/130-ctype.patch deleted file mode 100644 index b07ccdb9..00000000 --- a/patches/uClibc/0.9.28/130-ctype.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h ---- uClibc-dist/libc/sysdeps/linux/common/bits/uClibc_touplow.h Fri Jun 3 13:30:25 2005 -+++ uClibc/libc/sysdeps/linux/common/bits/uClibc_touplow.h Fri Jun 3 13:30:39 2005 -@@ -34,11 +34,11 @@ - - /* glibc uses the equivalent of - typedef __int32_t __ctype_touplow_t; */ - --typedef __uint16_t __ctype_mask_t; -+typedef __uint32_t __ctype_mask_t; - - #ifdef __UCLIBC_HAS_CTYPE_SIGNED__ - --typedef __int16_t __ctype_touplow_t; -+typedef __int32_t __ctype_touplow_t; - #define __UCLIBC_CTYPE_B_TBL_OFFSET 128 - #define __UCLIBC_CTYPE_TO_TBL_OFFSET 128 - diff --git a/patches/uClibc/0.9.28/140-fix_includes.sh.patch b/patches/uClibc/0.9.28/140-fix_includes.sh.patch deleted file mode 100644 index 0311c83a..00000000 --- a/patches/uClibc/0.9.28/140-fix_includes.sh.patch +++ /dev/null @@ -1,316 +0,0 @@ ---- uClibc-0.9.28/extra/scripts/fix_includes.sh.orig 2006-12-13 05:44:21.000000000 -0700 -+++ uClibc-0.9.28/extra/scripts/fix_includes.sh 2006-12-13 05:44:35.000000000 -0700 -@@ -1,183 +1,155 @@ - #!/bin/sh --# Copyright (C) 2003 Erik Andersen <andersen@uclibc.org> - # --# This program is free software; you can redistribute it and/or --# modify it under the terms of the GNU Library General Public --# License as published by the Free Software Foundation; either --# version 2 of the License, or (at your option) any later --# version. --# --# This program 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 Library General Public License for more details. --# --# You should have received a copy of the GNU Library General --# Public License along with this program; if not, write to the --# Free Software Foundation, Inc., 59 Temple Place, Suite 330, --# Boston, MA 02111-1307 USA -- --usage () { -- echo "" -- echo "usage: "`basename $0`" -k KERNEL_SOURCE_DIRECTORY -t TARGET_ARCH" -- echo "" -- echo "This utility scans the KERNEL_SOURCE_DIRECTORY directory and" -- echo "checks that it contains well formed kernel headers suitable" -- echo "for inclusion as the include/linux/ directory provided by" -- echo "uClibc." -- echo "" -- echo "If the specified kernel headers are present and already" -- echo "configured for the architecture specified by TARGET_ARCH," -- echo "they will be used as-is." -- echo "" -- echo "If the specified kernel headers are missing entirely, this" -- echo "script will return an error." -- echo "" -- echo "If the specified kernel headers are present, but are either" -- echo "not yet configured or are configured for an architecture" -- echo "different than that specified by TARGET_ARCH, this script" -- echo "will attempt to 'fix' the kernel headers and make them" -- echo "suitable for use by uClibc. This fixing process may fail." -- echo "It is therefore best to always provide kernel headers that" -- echo "are already configured for the selected architecture." -- echo "" -- echo "Most Linux distributions provide 'kernel-headers' packages" -- echo "that are suitable for use by uClibc." -- echo "" -- echo "" -- exit 1; -+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> -+# -+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -+# -+ -+usage() { -+ echo "" -+ echo "usage: "`basename $0`" -k KERNEL_SOURCE_DIRECTORY -t TARGET_ARCH" -+ echo "" -+ echo "This utility scans the KERNEL_SOURCE_DIRECTORY directory and" -+ echo "checks that it contains well formed kernel headers suitable" -+ echo "for inclusion as the include/linux/ directory provided by" -+ echo "uClibc." -+ echo "" -+ echo "If the specified kernel headers are present and already" -+ echo "configured for the architecture specified by TARGET_ARCH," -+ echo "they will be used as-is." -+ echo "" -+ echo "If the specified kernel headers are missing entirely, this" -+ echo "script will return an error." -+ echo "" -+ echo "If the specified kernel headers are present, but are either" -+ echo "not yet configured or are configured for an architecture" -+ echo "different than that specified by TARGET_ARCH, this script" -+ echo "will attempt to 'fix' the kernel headers and make them" -+ echo "suitable for use by uClibc. This fixing process may fail." -+ echo "It is therefore best to always provide kernel headers that" -+ echo "are already configured for the selected architecture." -+ echo "" -+ echo "Most Linux distributions provide 'kernel-headers' packages" -+ echo "that are suitable for use by uClibc." -+ echo "" -+ echo "" -+ exit 1 - } - --HAS_MMU="y"; -+ -+# -+# Parse our arguments -+# -+HAS_MMU="y" - while [ -n "$1" ]; do -- case $1 in -- -k ) shift; if [ -n "$1" ]; then KERNEL_SOURCE=$1; shift; else usage; fi; ;; -- -t ) shift; if [ -n "$1" ]; then TARGET_ARCH=$1; shift; else usage; fi; ;; -- -n ) shift; HAS_MMU="n"; ;; -- -* ) usage; ;; -- * ) usage; ;; -- esac; --done; -+ case $1 in -+ -k ) shift; if [ -n "$1" ]; then KERNEL_SOURCE=$1; shift; else usage; fi; ;; -+ -t ) shift; if [ -n "$1" ]; then TARGET_ARCH=$1; shift; else usage; fi; ;; -+ -n ) shift; HAS_MMU="n"; ;; -+ -* ) usage; ;; -+ * ) usage; ;; -+ esac -+done - --if [ ! -f "$KERNEL_SOURCE/Makefile" -a ! -f "$KERNEL_SOURCE/include/linux/version.h" ]; then -- echo ""; -- echo ""; -- echo "The file $KERNEL_SOURCE/Makefile or $KERNEL_SOURCE/include/linux/version.h is missing!"; -- echo "Perhaps your kernel source is broken?" -- echo ""; -- echo ""; -- exit 1; --fi; - --if [ ! -d "$KERNEL_SOURCE" ]; then -- echo ""; -- echo ""; -- echo "$KERNEL_SOURCE is not a directory"; -- echo ""; -- echo ""; -- exit 1; --fi; -- --if [ -f "$KERNEL_SOURCE/Makefile" ] ; then --# set current VERSION, PATCHLEVEL, SUBLEVEL, EXTRAVERSION --eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' $KERNEL_SOURCE/Makefile` --else --ver=`grep UTS_RELEASE $KERNEL_SOURCE/include/linux/version.h | cut -d '"' -f 2` --VERSION=`echo "$ver" | cut -d '.' -f 1` --PATCHLEVEL=`echo "$ver" | cut -d '.' -f 2` --if echo "$ver" | grep -q '-' ; then --SUBLEVEL=`echo "$ver" | sed "s/${VERSION}.${PATCHLEVEL}.//" | cut -d '-' -f 1` --EXTRAVERSION=`echo "$ver" | sed "s/${VERSION}.${PATCHLEVEL}.${SUBLEVEL}-//"` --else --SUBLEVEL=`echo "$ver" | cut -d '.' -f 3` --#EXTRAVERSION= --fi -+# -+# Perform some sanity checks on our kernel sources -+# -+if [ ! -f "$KERNEL_SOURCE/Makefile" -a ! -f "$KERNEL_SOURCE/include/linux/version.h" ]; then -+ echo "" -+ echo "" -+ echo "The file $KERNEL_SOURCE/Makefile or $KERNEL_SOURCE/include/linux/version.h is missing!" -+ echo "Perhaps your kernel source is broken?" -+ echo "" -+ echo "" -+ exit 1 - fi --if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ] --then -- echo "Unable to determine version for kernel headers" -- echo -e "\tprovided in directory $KERNEL_SOURCE" -- exit 1 -+if [ ! -d "$KERNEL_SOURCE" ]; then -+ echo "" -+ echo "" -+ echo "$KERNEL_SOURCE is not a directory" -+ echo "" -+ echo "" -+ exit 1 - fi - --if [ "$MAKE_IS_SILENT" != "y" ]; then --echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION}" --echo -e "\n" --echo "Using kernel headers from $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION} for architecture '$TARGET_ARCH'" --echo -e "\tprovided in directory $KERNEL_SOURCE" --echo -e "\n" --fi - -+# - # Create a symlink to include/asm -- -+# - rm -f include/asm* - if [ ! -d "$KERNEL_SOURCE/include/asm" ]; then -- echo ""; -- echo ""; -- echo "The symlink $KERNEL_SOURCE/include/asm is missing\!"; -- echo "Perhaps you forgot to configure your kernel source?"; -- echo "You really should configure your kernel source tree so I"; -- echo "do not have to try and guess about this sort of thing."; -- echo "" -- echo "Attempting to guess a usable value...."; -- echo "" -- echo ""; -- sleep 1; -- -- if [ "$TARGET_ARCH" = "powerpc" ];then -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-ppc include/asm; -- set +x; -- elif [ "$TARGET_ARCH" = "mips" ];then -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-mips include/asm; -- set +x; -- elif [ "$TARGET_ARCH" = "arm" ];then -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-arm include/asm; -- set +x; -- if [ ! -L $KERNEL_SOURCE/include/asm-arm/proc ] ; then -- if [ ! -L proc ] ; then -- (cd include/asm; -- ln -fs proc-armv proc; -- ln -fs arch-ebsa285 arch); -- fi -+ echo "" -+ echo "" -+ echo "The symlink $KERNEL_SOURCE/include/asm is missing\!" -+ echo "Perhaps you forgot to configure your kernel source?" -+ echo "You really should configure your kernel source tree so I" -+ echo "do not have to try and guess about this sort of thing." -+ echo "" -+ echo "Attempting to guess a usable value...." -+ echo "" -+ echo "" -+ sleep 1 -+ -+ if [ "$TARGET_ARCH" = "powerpc" ]; then -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-ppc include/asm -+ set +x -+ elif [ "$TARGET_ARCH" = "mips" ]; then -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-mips include/asm -+ set +x -+ elif [ "$TARGET_ARCH" = "arm" ]; then -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-arm include/asm -+ set +x -+ if [ ! -L $KERNEL_SOURCE/include/asm-arm/proc ]; then -+ if [ ! -L proc ]; then -+ ( -+ cd include/asm -+ ln -fs proc-armv proc -+ ln -fs arch-ebsa285 arch -+ ) -+ fi -+ fi -+ elif [ "$TARGET_ARCH" = "cris" ]; then -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-cris include/asm -+ set +x -+ elif [ "$HAS_MMU" != "y" ]; then -+ if [ -d $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu ]; then -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu include/asm -+ set +x -+ else -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm -+ set +x -+ fi -+ else -+ set -x -+ ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm -+ set +x - fi; -- elif [ "$TARGET_ARCH" = "cris" ]; then -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-cris include/asm; -- set +x; -- elif [ "$HAS_MMU" != "y" ]; then -- if [ -d $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu ] ; then -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu include/asm; -- set +x; -- else -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm; -- set +x; -- fi; -- else -- set -x; -- ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm; -- set +x; -- fi; - else --# No guessing required..... --ln -fs $KERNEL_SOURCE/include/asm include/asm --if [ -e $KERNEL_SOURCE/include/asm-$TARGET_ARCH ] ; then --ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm-$TARGET_ARCH -+ # No guessing required..... -+ for x in $KERNEL_SOURCE/include/asm* ; do -+ ln -fs ${x} include/ -+ done - fi --fi; - - -+# - # Annoyingly, 2.6.x kernel headers also need an include/asm-generic/ directory --if [ $VERSION -eq 2 ] && [ $PATCHLEVEL -ge 6 ] ; then -- ln -fs $KERNEL_SOURCE/include/asm-generic include/asm-generic --fi; -+# -+if [ -e $KERNEL_SOURCE/include/asm-generic ]; then -+ rm -f include/asm-generic -+ ln -fs $KERNEL_SOURCE/include/asm-generic include/asm-generic -+fi - - -+# - # Create the include/linux symlink. -+# - rm -f include/linux - ln -fs $KERNEL_SOURCE/include/linux include/linux -- diff --git a/patches/uClibc/0.9.28/150-custom-ISA.patch b/patches/uClibc/0.9.28/150-custom-ISA.patch deleted file mode 100644 index 2cc9bcb5..00000000 --- a/patches/uClibc/0.9.28/150-custom-ISA.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -dur uClibc-0.9.28.orig/Rules.mak uClibc-0.9.28/Rules.mak ---- uClibc-0.9.28.orig/Rules.mak 2005-08-18 00:49:49.000000000 +0200 -+++ uClibc-0.9.28/Rules.mak 2007-01-30 10:53:34.000000000 +0100 -@@ -168,6 +168,7 @@ - CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32 -+ CPU_CFLAGS-$(CONFIG_MIPS_ISA_CUSTOM)+=-march=$(CONFIG_MIPS_CPU_CFLAGS_CUSTOM) - endif - - ifeq ($(strip $(TARGET_ARCH)),sh) -diff -dur uClibc-0.9.28.orig/extra/Configs/Config.mips uClibc-0.9.28/extra/Configs/Config.mips ---- uClibc-0.9.28.orig/extra/Configs/Config.mips 2005-08-18 00:49:41.000000000 +0200 -+++ uClibc-0.9.28/extra/Configs/Config.mips 2007-01-30 10:52:12.000000000 +0100 -@@ -63,4 +63,16 @@ - config CONFIG_MIPS_ISA_MIPS64 - bool "MIPS64" - -+config CONFIG_MIPS_ISA_CUSTOM -+ bool "Custom" -+ - endchoice -+ -+config CONFIG_MIPS_CPU_CFLAGS_CUSTOM -+ string -+ prompt "Custon ISA" -+ depends on CONFIG_MIPS_ISA_CUSTOM -+ default "" -+ help -+ Enter your custom ISA here (eg: lx4189!). -+ diff --git a/patches/uClibc/0.9.28/160-mips-asm.h.patch b/patches/uClibc/0.9.28/160-mips-asm.h.patch deleted file mode 100644 index 285feed7..00000000 --- a/patches/uClibc/0.9.28/160-mips-asm.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S 2007-02-07 10:41:34.000000000 +0100 -@@ -24,7 +24,7 @@ - #include <sys/regdef.h> - #define _ERRNO_H 1 - #include <bits/errno.h> --#include <asm/asm.h> -+#include <sys/asm.h> - - /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */ - -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S 2007-02-07 11:16:52.000000000 +0100 -@@ -3,9 +3,9 @@ - /*see uClibc's sh/pipe.c and glibc-2.2.4's mips/pipe.S */ - - #include <features.h> --#include <asm/asm.h> -+#include <sys/asm.h> - #include <asm/unistd.h> --#include <asm/regdef.h> -+#include <sys/regdef.h> - - .globl pipe - .ent pipe, 0 -diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S ---- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S 2007-02-07 11:18:12.000000000 +0100 -+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S 2007-02-07 11:17:03.000000000 +0100 -@@ -17,8 +17,8 @@ - 02111-1307 USA. */ - - #include <features.h> --#include <asm/asm.h> --#include <asm/regdef.h> -+#include <sys/asm.h> -+#include <sys/regdef.h> - - #ifdef __PIC__ - .option pic2 diff --git a/patches/uClibc/20080801/100-ifaddrs.patch b/patches/uClibc/20080801/100-ifaddrs.patch deleted file mode 100644 index 97b19847..00000000 --- a/patches/uClibc/20080801/100-ifaddrs.patch +++ /dev/null @@ -1,190 +0,0 @@ -Copyright 2008 Yann E. MORIN. - -This patch is needed to make gcc-4.3.1 able to build the Java frontend. - -Index: uClibc/libc/inet/ifaddrs.c -=================================================================== ---- uClibc/libc/inet/ifaddrs.c (revision 23002) -+++ uClibc/libc/inet/ifaddrs.c (working copy) -@@ -22,7 +22,7 @@ - #include <alloca.h> - #include <assert.h> - #include <errno.h> --#include "ifaddrs.h" -+#include <ifaddrs.h> - #include <net/if.h> - #include <netinet/in.h> - #include <netpacket/packet.h> -Index: uClibc/libc/inet/ifaddrs.h -=================================================================== ---- uClibc/libc/inet/ifaddrs.h (revision 23002) -+++ uClibc/libc/inet/ifaddrs.h (working copy) -@@ -1,76 +0,0 @@ --/* ifaddrs.h -- declarations for getting network interface addresses -- Copyright (C) 2002 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. */ -- --#ifndef _IFADDRS_H --#define _IFADDRS_H 1 -- --#include <features.h> --#include <sys/socket.h> --#include <stdbool.h> --#include <stdint.h> -- --__BEGIN_DECLS -- --/* The `getifaddrs' function generates a linked list of these structures. -- Each element of the list describes one network interface. */ --struct ifaddrs --{ -- struct ifaddrs *ifa_next; /* Pointer to the next structure. */ -- -- char *ifa_name; /* Name of this network interface. */ -- unsigned int ifa_flags; /* Flags as from SIOCGIFFLAGS ioctl. */ -- -- struct sockaddr *ifa_addr; /* Network address of this interface. */ -- struct sockaddr *ifa_netmask; /* Netmask of this interface. */ -- union -- { -- /* At most one of the following two is valid. If the IFF_BROADCAST -- bit is set in `ifa_flags', then `ifa_broadaddr' is valid. If the -- IFF_POINTOPOINT bit is set, then `ifa_dstaddr' is valid. -- It is never the case that both these bits are set at once. */ -- struct sockaddr *ifu_broadaddr; /* Broadcast address of this interface. */ -- struct sockaddr *ifu_dstaddr; /* Point-to-point destination address. */ -- } ifa_ifu; -- /* These very same macros are defined by <net/if.h> for `struct ifaddr'. -- So if they are defined already, the existing definitions will be fine. */ --# ifndef ifa_broadaddr --# define ifa_broadaddr ifa_ifu.ifu_broadaddr --# endif --# ifndef ifa_dstaddr --# define ifa_dstaddr ifa_ifu.ifu_dstaddr --# endif -- -- void *ifa_data; /* Address-specific data (may be unused). */ --}; -- -- --/* Create a linked list of `struct ifaddrs' structures, one for each -- network interface on the host machine. If successful, store the -- list in *IFAP and return 0. On errors, return -1 and set `errno'. -- -- The storage returned in *IFAP is allocated dynamically and can -- only be properly freed by passing it to `freeifaddrs'. */ --extern int getifaddrs (struct ifaddrs **__ifap) __THROW; -- --/* Reclaim the storage allocated by a previous `getifaddrs' call. */ --extern void freeifaddrs (struct ifaddrs *__ifa) __THROW; -- --__END_DECLS -- --#endif /* ifaddrs.h */ -Index: uClibc/libc/inet/getaddrinfo.c -=================================================================== ---- uClibc/libc/inet/getaddrinfo.c (revision 23002) -+++ uClibc/libc/inet/getaddrinfo.c (working copy) -@@ -68,7 +68,7 @@ - #include <sys/un.h> - #include <sys/utsname.h> - #include <net/if.h> --#include "ifaddrs.h" -+#include <ifaddrs.h> - - /* Experimentally off - libc_hidden_proto(memcpy) */ - /* Experimentally off - libc_hidden_proto(memset) */ ---- /dev/null 2008-08-04 09:44:45.624322752 +0200 -+++ uClibc/include/ifaddrs.h 2008-08-05 09:31:20.000000000 +0200 -@@ -0,0 +1,76 @@ -+/* ifaddrs.h -- declarations for getting network interface addresses -+ Copyright (C) 2002 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. */ -+ -+#ifndef _IFADDRS_H -+#define _IFADDRS_H 1 -+ -+#include <features.h> -+#include <sys/socket.h> -+#include <stdbool.h> -+#include <stdint.h> -+ -+__BEGIN_DECLS -+ -+/* The `getifaddrs' function generates a linked list of these structures. -+ Each element of the list describes one network interface. */ -+struct ifaddrs -+{ -+ struct ifaddrs *ifa_next; /* Pointer to the next structure. */ -+ -+ char *ifa_name; /* Name of this network interface. */ -+ unsigned int ifa_flags; /* Flags as from SIOCGIFFLAGS ioctl. */ -+ -+ struct sockaddr *ifa_addr; /* Network address of this interface. */ -+ struct sockaddr *ifa_netmask; /* Netmask of this interface. */ -+ union -+ { -+ /* At most one of the following two is valid. If the IFF_BROADCAST -+ bit is set in `ifa_flags', then `ifa_broadaddr' is valid. If the -+ IFF_POINTOPOINT bit is set, then `ifa_dstaddr' is valid. -+ It is never the case that both these bits are set at once. */ -+ struct sockaddr *ifu_broadaddr; /* Broadcast address of this interface. */ -+ struct sockaddr *ifu_dstaddr; /* Point-to-point destination address. */ -+ } ifa_ifu; -+ /* These very same macros are defined by <net/if.h> for `struct ifaddr'. -+ So if they are defined already, the existing definitions will be fine. */ -+# ifndef ifa_broadaddr -+# define ifa_broadaddr ifa_ifu.ifu_broadaddr -+# endif -+# ifndef ifa_dstaddr -+# define ifa_dstaddr ifa_ifu.ifu_dstaddr -+# endif -+ -+ void *ifa_data; /* Address-specific data (may be unused). */ -+}; -+ -+ -+/* Create a linked list of `struct ifaddrs' structures, one for each -+ network interface on the host machine. If successful, store the -+ list in *IFAP and return 0. On errors, return -1 and set `errno'. -+ -+ The storage returned in *IFAP is allocated dynamically and can -+ only be properly freed by passing it to `freeifaddrs'. */ -+extern int getifaddrs (struct ifaddrs **__ifap) __THROW; -+ -+/* Reclaim the storage allocated by a previous `getifaddrs' call. */ -+extern void freeifaddrs (struct ifaddrs *__ifa) __THROW; -+ -+__END_DECLS -+ -+#endif /* ifaddrs.h */ diff --git a/patches/uClibc/20080801/200-mips-typeof.patch b/patches/uClibc/20080801/200-mips-typeof.patch deleted file mode 100644 index 668e568f..00000000 --- a/patches/uClibc/20080801/200-mips-typeof.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: uClibc/libc/sysdeps/linux/mips/bits/atomic.h -=================================================================== ---- uClibc/libc/sysdeps/linux/mips/bits/atomic.h (revision 23002) -+++ uClibc/libc/sysdeps/linux/mips/bits/atomic.h (working copy) -@@ -110,22 +110,22 @@ - /* For all "bool" routines, we return FALSE if exchange succesful. */ - - #define __arch_compare_and_exchange_bool_8_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_8_int(mem, new, old, rel, acq); \ - !__cmp; }) - - #define __arch_compare_and_exchange_bool_16_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_16_int(mem, new, old, rel, acq); \ - !__cmp; }) - - #define __arch_compare_and_exchange_bool_32_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_32_int(mem, new, old, rel, acq); \ - !__cmp; }) - - #define __arch_compare_and_exchange_bool_64_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_64_int(mem, new, old, rel, acq); \ - !__cmp; }) - -@@ -133,24 +133,24 @@ - successful or not. */ - - #define __arch_compare_and_exchange_val_8_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_8_int(mem, new, old, rel, acq); \ -- (typeof (*mem))__prev; }) -+ (__typeof (*mem))__prev; }) - - #define __arch_compare_and_exchange_val_16_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_16_int(mem, new, old, rel, acq); \ -- (typeof (*mem))__prev; }) -+ (__typeof (*mem))__prev; }) - - #define __arch_compare_and_exchange_val_32_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_32_int(mem, new, old, rel, acq); \ -- (typeof (*mem))__prev; }) -+ (__typeof (*mem))__prev; }) - - #define __arch_compare_and_exchange_val_64_int(mem, new, old, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __arch_compare_and_exchange_xxx_64_int(mem, new, old, rel, acq); \ -- (typeof (*mem))__prev; }) -+ (__typeof (*mem))__prev; }) - - /* Compare and exchange with "acquire" semantics, ie barrier after. */ - -@@ -183,7 +183,7 @@ - (abort (), 0) - - #define __arch_exchange_xxx_32_int(mem, newval, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __asm__ __volatile__ ("\n" \ - ".set push\n\t" \ - MIPS_PUSH_MIPS2 \ -@@ -207,7 +207,7 @@ - (abort (), 0) - #else - #define __arch_exchange_xxx_64_int(mem, newval, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __asm__ __volatile__ ("\n" \ - ".set push\n\t" \ - MIPS_PUSH_MIPS2 \ -@@ -236,13 +236,13 @@ - /* Atomically add value and return the previous (unincremented) value. */ - - #define __arch_exchange_and_add_8_int(mem, newval, rel, acq) \ -- (abort (), (typeof(*mem)) 0) -+ (abort (), (__typeof(*mem)) 0) - - #define __arch_exchange_and_add_16_int(mem, newval, rel, acq) \ -- (abort (), (typeof(*mem)) 0) -+ (abort (), (__typeof(*mem)) 0) - - #define __arch_exchange_and_add_32_int(mem, value, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __asm__ __volatile__ ("\n" \ - ".set push\n\t" \ - MIPS_PUSH_MIPS2 \ -@@ -263,10 +263,10 @@ - #if _MIPS_SIM == _ABIO32 - /* We can't do an atomic 64-bit operation in O32. */ - #define __arch_exchange_and_add_64_int(mem, value, rel, acq) \ -- (abort (), (typeof(*mem)) 0) -+ (abort (), (__typeof(*mem)) 0) - #else - #define __arch_exchange_and_add_64_int(mem, value, rel, acq) \ --({ typeof (*mem) __prev; int __cmp; \ -+({ __typeof (*mem) __prev; int __cmp; \ - __asm__ __volatile__ ( \ - ".set push\n\t" \ - MIPS_PUSH_MIPS2 \ diff --git a/patches/uClibc/20080801/300-fix-asm.patch b/patches/uClibc/20080801/300-fix-asm.patch deleted file mode 100644 index 1f57e5c6..00000000 --- a/patches/uClibc/20080801/300-fix-asm.patch +++ /dev/null @@ -1,175 +0,0 @@ -Index: uClibc/ldso/ldso/sparc/dl-sysdep.h -=================================================================== ---- uClibc/ldso/ldso/sparc/dl-sysdep.h (revision 23055) -+++ uClibc/ldso/ldso/sparc/dl-sysdep.h (working copy) -@@ -141,7 +141,7 @@ - static __inline__ Elf32_Addr - elf_machine_load_address (void) - { -- register Elf32_Addr *pc __asm__ ("%o7"), *got __asm ("%l7"); -+ register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7"); - - __asm__ ("sethi %%hi(_GLOBAL_OFFSET_TABLE_-4), %1\n\t" - "call 1f\n\t" -Index: uClibc/libc/sysdeps/linux/i386/bits/mathinline.h -=================================================================== ---- uClibc/libc/sysdeps/linux/i386/bits/mathinline.h (revision 23055) -+++ uClibc/libc/sysdeps/linux/i386/bits/mathinline.h (working copy) -@@ -299,12 +299,12 @@ - __extension__ long long int __p = (long long int) __x; \ - if (__x == (long double) __p) \ - { \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fscale" \ - : "=t" (__value) : "0" (1.0), "u" (__x)); \ - return __value; \ - } \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fld %%st(0)\n\t" \ - "frndint # int(x)\n\t" \ - "fxch\n\t" \ -@@ -312,7 +312,7 @@ - "f2xm1 # 2^(fract(x)) - 1\n\t" \ - : "=t" (__value), "=u" (__exponent) : "0" (__x)); \ - __value += 1.0; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fscale" \ - : "=t" (__value) : "0" (__value), "u" (__exponent)); \ - return __value) -@@ -321,7 +321,7 @@ - # define __sincos_code \ - register long double __cosr; \ - register long double __sinr; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fsincos\n\t" \ - "fnstsw %%ax\n\t" \ - "testl $0x400, %%eax\n\t" \ -@@ -373,7 +373,7 @@ - register long double __value; \ - register long double __exponent; \ - register long double __temp; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fldl2e # e^x - 1 = 2^(x * log2(e)) - 1\n\t" \ - "fmul %%st(1) # x * log2(e)\n\t" \ - "fst %%st(1)\n\t" \ -@@ -383,7 +383,7 @@ - "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" \ - "fscale # 2^(x * log2(e)) - 2^(int(x * log2(e)))\n\t" \ - : "=t" (__value), "=u" (__exponent) : "0" (__x)); \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fscale # 2^int(x * log2(e))\n\t" \ - : "=t" (__temp) : "0" (1.0), "u" (__exponent)); \ - __temp -= 1.0; \ -@@ -398,7 +398,7 @@ - # define __exp_code \ - register long double __value; \ - register long double __exponent; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fldl2e # e^x = 2^(x * log2(e))\n\t" \ - "fmul %%st(1) # x * log2(e)\n\t" \ - "fst %%st(1)\n\t" \ -@@ -408,7 +408,7 @@ - "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" \ - : "=t" (__value), "=u" (__exponent) : "0" (__x)); \ - __value += 1.0; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fscale" \ - : "=t" (__value) : "0" (__value), "u" (__exponent)); \ - return __value -@@ -421,7 +421,7 @@ - __inline_mathcodeNP (tan, __x, \ - register long double __value; \ - register long double __value2 __attribute__ ((__unused__)); \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fptan" \ - : "=t" (__value2), "=u" (__value) : "0" (__x)); \ - return __value) -@@ -435,7 +435,7 @@ - #else - # define __atan2_code \ - register long double __value; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fpatan" \ - : "=t" (__value) : "0" (__x), "u" (__y) : "st(1)"); \ - return __value -@@ -449,7 +449,7 @@ - #if defined __FAST_MATH__ && !__GNUC_PREREQ (3, 5) - __inline_mathcodeNP2 (fmod, __x, __y, \ - register long double __value; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("1: fprem\n\t" \ - "fnstsw %%ax\n\t" \ - "sahf\n\t" \ -@@ -552,7 +552,7 @@ - #ifdef __FAST_MATH__ - # define __ldexp_code \ - register long double __value; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fscale" \ - : "=t" (__value) : "0" (__x), "u" ((long double) __y)); \ - return __value -@@ -581,7 +581,7 @@ - if (__fabsl (__x) >= 1.0 - 0.5 * __M_SQRT2) \ - __value = logl (1.0 + __x); \ - else \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fldln2\n\t" \ - "fxch\n\t" \ - "fyl2xp1" \ -@@ -611,7 +611,7 @@ - __inline_mathcodeNP(logb, __x, \ - register long double __value; \ - register long double __junk; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("fxtract\n\t" \ - : "=t" (__junk), "=u" (__value) : "0" (__x)); \ - return __value) -@@ -699,7 +699,7 @@ - __inline_mathcodeNP2 (drem, __x, __y, \ - register double __value; \ - register int __clobbered; \ -- __asm __volatile__ \ -+ __asm__ __volatile__ \ - ("1: fprem1\n\t" \ - "fstsw %%ax\n\t" \ - "sahf\n\t" \ -Index: uClibc/libc/sysdeps/linux/x86_64/sigaction.c -=================================================================== ---- uClibc/libc/sysdeps/linux/x86_64/sigaction.c (revision 23055) -+++ uClibc/libc/sysdeps/linux/x86_64/sigaction.c (working copy) -@@ -135,7 +135,7 @@ - - #define RESTORE(name, syscall) RESTORE2 (name, syscall) - # define RESTORE2(name, syscall) \ --asm \ -+__asm__ \ - ( \ - ".text\n" \ - "__" #name ":\n" \ -Index: uClibc/libc/sysdeps/linux/mips/sigaction.c -=================================================================== ---- uClibc/libc/sysdeps/linux/mips/sigaction.c (revision 23055) -+++ uClibc/libc/sysdeps/linux/mips/sigaction.c (working copy) -@@ -140,7 +140,7 @@ - - #define RESTORE(name, syscall) RESTORE2 (name, syscall) - #define RESTORE2(name, syscall) \ --asm \ -+__asm__ \ - ( \ - ".align 4\n" \ - "__" #name ":\n" \ |