From 56f56ed8bfbd835facce660d14809b72335f7f6e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 4 Mar 2007 12:33:12 +0000 Subject: [PATCH] Argh! I forgot to commit the uClibc-0.9.28.3 patches... --- .../0.9.28.3/000-string-functions.patch | 14 +++++++ patches/uClibc/0.9.28.3/001-install_dev.patch | 22 ++++++++++ .../0.9.28.3/002-no_LFS-no_readahead.patch | 14 +++++++ .../uClibc/0.9.28.3/004-uClibc_ctype.patch | 17 ++++++++ patches/uClibc/0.9.28.3/200-custom-ISA.patch | 31 ++++++++++++++ patches/uClibc/0.9.28.3/201-mips-asm.h.patch | 41 +++++++++++++++++++ 6 files changed, 139 insertions(+) create mode 100644 patches/uClibc/0.9.28.3/000-string-functions.patch create mode 100644 patches/uClibc/0.9.28.3/001-install_dev.patch create mode 100644 patches/uClibc/0.9.28.3/002-no_LFS-no_readahead.patch create mode 100644 patches/uClibc/0.9.28.3/004-uClibc_ctype.patch create mode 100644 patches/uClibc/0.9.28.3/200-custom-ISA.patch create mode 100644 patches/uClibc/0.9.28.3/201-mips-asm.h.patch diff --git a/patches/uClibc/0.9.28.3/000-string-functions.patch b/patches/uClibc/0.9.28.3/000-string-functions.patch new file mode 100644 index 00000000..ab6c2553 --- /dev/null +++ b/patches/uClibc/0.9.28.3/000-string-functions.patch @@ -0,0 +1,14 @@ +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.3/001-install_dev.patch b/patches/uClibc/0.9.28.3/001-install_dev.patch new file mode 100644 index 00000000..4b424678 --- /dev/null +++ b/patches/uClibc/0.9.28.3/001-install_dev.patch @@ -0,0 +1,22 @@ +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.3/002-no_LFS-no_readahead.patch b/patches/uClibc/0.9.28.3/002-no_LFS-no_readahead.patch new file mode 100644 index 00000000..ca0568ca --- /dev/null +++ b/patches/uClibc/0.9.28.3/002-no_LFS-no_readahead.patch @@ -0,0 +1,14 @@ +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.3/004-uClibc_ctype.patch b/patches/uClibc/0.9.28.3/004-uClibc_ctype.patch new file mode 100644 index 00000000..b07ccdb9 --- /dev/null +++ b/patches/uClibc/0.9.28.3/004-uClibc_ctype.patch @@ -0,0 +1,17 @@ +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.3/200-custom-ISA.patch b/patches/uClibc/0.9.28.3/200-custom-ISA.patch new file mode 100644 index 00000000..2cc9bcb5 --- /dev/null +++ b/patches/uClibc/0.9.28.3/200-custom-ISA.patch @@ -0,0 +1,31 @@ +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.3/201-mips-asm.h.patch b/patches/uClibc/0.9.28.3/201-mips-asm.h.patch new file mode 100644 index 00000000..285feed7 --- /dev/null +++ b/patches/uClibc/0.9.28.3/201-mips-asm.h.patch @@ -0,0 +1,41 @@ +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 + #define _ERRNO_H 1 + #include +-#include ++#include + + /* 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 +-#include ++#include + #include +-#include ++#include + + .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 +-#include +-#include ++#include ++#include + + #ifdef __PIC__ + .option pic2