From a7e2b63152abf14e74c0a565b067dfcc68af15ad Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 11 Sep 2013 12:08:37 +0000 Subject: [PATCH 1/1] toolchain: refresh uClibc patches Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37939 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../010-backport_sscanf_alloc.patch | 6 +- .../patches-0.9.33.2/011-dlsym_rtld_next_fix.patch | 9 ++- .../131-inet-fix-__read_etc_hosts_r-segfault.patch | 2 +- .../uClibc/patches-0.9.33.2/500-eventfd.patch | 6 -- .../970-add___kernel_long_and___kernel_ulong.patch | 64 +++------------------- .../uClibc/patches-0.9.33.2/980-mips64_fixes.patch | 14 ++--- 6 files changed, 23 insertions(+), 78 deletions(-) diff --git a/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch b/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch index f5f3cc4d4e..b5ce091264 100644 --- a/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch +++ b/toolchain/uClibc/patches-0.9.33.2/010-backport_sscanf_alloc.patch @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in -@@ -1597,19 +1597,6 @@ config UCLIBC_PRINTF_SCANF_POSITIONAL_AR +@@ -1590,19 +1590,6 @@ config UCLIBC_PRINTF_SCANF_POSITIONAL_AR Most people will answer 9. @@ -130,7 +130,7 @@ Signed-off-by: Felix Fietkau for (p = spec_ranges; p_m_spec_chars > *p ; ++p) {} if (((psfs->dataargtype >> 8) | psfs->flags) -@@ -1265,12 +1258,6 @@ int VFSCANF (FILE *__restrict fp, const +@@ -1265,12 +1258,6 @@ int VFSCANF (FILE *__restrict fp, const while (*wf && __isascii(*wf) && (b < buf + sizeof(buf) - 1)) { *b++ = *wf++; } @@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau *b = 0; if (b == buf) { /* Bad conversion specifier! */ goto DONE; -@@ -1390,13 +1377,36 @@ int VFSCANF (FILE *__restrict fp, const +@@ -1390,13 +1377,36 @@ int VFSCANF (FILE *__restrict fp, const } if (psfs.conv_num == CONV_s) { diff --git a/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch b/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch index 5c90ca590b..f1a8ff5164 100644 --- a/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch +++ b/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch @@ -1,7 +1,6 @@ -diff -urN uClibc-0.9.33.2/ldso/libdl/libdl.c uClibc-0.9.33.2.new/ldso/libdl/libdl.c ---- uClibc-0.9.33.2/ldso/libdl/libdl.c 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc-0.9.33.2.new/ldso/libdl/libdl.c 2012-11-10 18:34:56.673501060 +0100 -@@ -671,7 +671,7 @@ +--- a/ldso/libdl/libdl.c ++++ b/ldso/libdl/libdl.c +@@ -671,7 +671,7 @@ static void *do_dlsym(void *vhandle, con { struct elf_resolve *tpnt, *tfrom; struct dyn_elf *handle; @@ -10,7 +9,7 @@ diff -urN uClibc-0.9.33.2/ldso/libdl/libdl.c uClibc-0.9.33.2.new/ldso/libdl/libd struct dyn_elf *rpnt; void *ret; struct symbol_ref sym_ref = { NULL, NULL }; -@@ -729,7 +729,12 @@ +@@ -729,7 +729,12 @@ static void *do_dlsym(void *vhandle, con tpnt = NULL; if (handle == _dl_symbol_tables) tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */ diff --git a/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch b/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch index 74b6857636..bd9ed380a6 100644 --- a/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch +++ b/toolchain/uClibc/patches-0.9.33.2/131-inet-fix-__read_etc_hosts_r-segfault.patch @@ -1,6 +1,6 @@ --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c -@@ -1634,6 +1634,7 @@ int attribute_hidden __read_etc_hosts_r( +@@ -1631,6 +1631,7 @@ int attribute_hidden __read_etc_hosts_r( * struct in[6]_addr * char line_buffer[BUFSZ+]; */ diff --git a/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch b/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch index 778129e09b..374052c5b5 100644 --- a/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch +++ b/toolchain/uClibc/patches-0.9.33.2/500-eventfd.patch @@ -11,8 +11,6 @@ Thanks Eugene Rudoy for reporting it and also providing the patch Signed-off-by: Khem Raj --- -diff --git a/libc/sysdeps/linux/common/eventfd.c b/libc/sysdeps/linux/common/eventfd.c -index cc3f3f0..96597ab 100644 --- a/libc/sysdeps/linux/common/eventfd.c +++ b/libc/sysdeps/linux/common/eventfd.c @@ -7,12 +7,24 @@ @@ -42,8 +40,6 @@ index cc3f3f0..96597ab 100644 +#endif +} #endif -diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c -index 4d1e26c..7af14c1 100644 --- a/libc/sysdeps/linux/common/stubs.c +++ b/libc/sysdeps/linux/common/stubs.c @@ -93,7 +93,7 @@ make_stub(epoll_ctl) @@ -55,5 +51,3 @@ index 4d1e26c..7af14c1 100644 make_stub(eventfd) #endif --- -cgit v0.9.0.1-2-gef13 diff --git a/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch b/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch index 04d3ddcf56..d790664ba4 100644 --- a/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch +++ b/toolchain/uClibc/patches-0.9.33.2/970-add___kernel_long_and___kernel_ulong.patch @@ -50,11 +50,9 @@ I can break this up per arch or per maintainer if requested. 22 files changed, 50 insertions(+) Signed-off-by: Bernhard Reutner-Fischer --- -diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h -index d5574c9..cd59b9d 100644 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h -@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t; +@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_ typedef __kernel_uid_t __kernel_uid32_t; typedef __kernel_gid_t __kernel_gid32_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -63,11 +61,9 @@ index d5574c9..cd59b9d 100644 typedef struct { int val[2]; -diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h -index 766a306..6b36f32 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h -@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t; +@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -76,8 +72,6 @@ index 766a306..6b36f32 100644 typedef struct { #ifdef __USE_ALL -diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h -index f7d8b52..c551d57 100644 --- a/libc/sysdeps/linux/avr32/bits/kernel_types.h +++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h @@ -39,6 +39,8 @@ typedef unsigned int __kernel_gid32_t; @@ -89,11 +83,9 @@ index f7d8b52..c551d57 100644 #ifdef __GNUC__ typedef long long __kernel_loff_t; -diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h -index d69a875..9fec595 100644 --- a/libc/sysdeps/linux/bfin/bits/kernel_types.h +++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h -@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t; +@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_ typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -102,8 +94,6 @@ index d69a875..9fec595 100644 typedef struct { #ifdef __USE_ALL -diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h -index 7557309..2c363a8 100644 --- a/libc/sysdeps/linux/c6x/bits/kernel_types.h +++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h @@ -22,6 +22,8 @@ typedef unsigned int __kernel_gid32_t; @@ -115,11 +105,9 @@ index 7557309..2c363a8 100644 typedef unsigned int __kernel_size_t; typedef int __kernel_ssize_t; typedef int __kernel_ptrdiff_t; -diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h -index f122c7f..5d31f7b 100644 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h -@@ -28,6 +28,8 @@ typedef unsigned int __kernel_gid32_t; +@@ -28,6 +28,8 @@ typedef unsigned int __kernel_gid32_t typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -128,8 +116,6 @@ index f122c7f..5d31f7b 100644 #ifdef __GNUC__ typedef long long __kernel_loff_t; -diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h -index 8017d85..f55a129 100644 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h @@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t; @@ -141,11 +127,9 @@ index 8017d85..f55a129 100644 typedef long long __kernel_loff_t; /* -diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h -index 0570675..4cfd1bf 100644 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h -@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t; +@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_ typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -154,8 +138,6 @@ index 0570675..4cfd1bf 100644 typedef struct { #ifdef __USE_ALL -diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h -index 4441f9b..6b2e794 100644 --- a/libc/sysdeps/linux/hppa/bits/kernel_types.h +++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h @@ -45,6 +45,8 @@ typedef long long __kernel_off64_t; @@ -167,8 +149,6 @@ index 4441f9b..6b2e794 100644 typedef struct { #ifdef __USE_ALL -diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h -index 9c07c72..59044b8 100644 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h @@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t; @@ -180,8 +160,6 @@ index 9c07c72..59044b8 100644 typedef long long __kernel_loff_t; typedef struct { -diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h -index c8ef86d..e31dc65 100644 --- a/libc/sysdeps/linux/ia64/bits/kernel_types.h +++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h @@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t; @@ -192,11 +170,9 @@ index c8ef86d..e31dc65 100644 +typedef unsigned long __kernel_ulong_t; #endif /* _ASM_IA64_POSIX_TYPES_H */ -diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h -index 0a77a8f..176b968 100644 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h -@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_t; +@@ -32,6 +32,8 @@ typedef unsigned short __kernel_old_uid_ typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -205,8 +181,6 @@ index 0a77a8f..176b968 100644 typedef struct { #ifdef __USE_ALL -diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h -index 2a70575..a9f736b 100644 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h @@ -44,6 +44,8 @@ typedef unsigned int __kernel_gid32_t; @@ -218,8 +192,6 @@ index 2a70575..a9f736b 100644 #ifdef __GNUC__ typedef long long __kernel_loff_t; -diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h -index 9fc3b96..97faeac 100644 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h @@ -32,6 +32,8 @@ typedef int __kernel_gid32_t; @@ -240,8 +212,6 @@ index 9fc3b96..97faeac 100644 typedef long long __kernel_loff_t; #endif -diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h -index 8b86d79..3c030e7 100644 --- a/libc/sysdeps/linux/nios2/bits/kernel_types.h +++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h @@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t; @@ -253,8 +223,6 @@ index 8b86d79..3c030e7 100644 typedef long long __kernel_loff_t; typedef struct { -diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h -index 3f3b933..1167de2 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h @@ -36,6 +36,8 @@ typedef unsigned int __kernel_gid32_t; @@ -275,8 +243,6 @@ index 3f3b933..1167de2 100644 typedef long long __kernel_loff_t; #endif -diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h -index f96e9fa..ac97261 100644 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h @@ -32,6 +32,8 @@ typedef unsigned int __kernel_gid32_t; @@ -288,11 +254,9 @@ index f96e9fa..ac97261 100644 typedef long long __kernel_loff_t; typedef struct { -diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h -index 671cc83..8cc6c61 100644 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h -@@ -43,6 +43,8 @@ typedef unsigned int __kernel_gid32_t; +@@ -43,6 +43,8 @@ typedef unsigned int __kernel_gid32_t typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -301,11 +265,9 @@ index 671cc83..8cc6c61 100644 typedef long long __kernel_loff_t; typedef struct { -diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h -index 0cc4bc2..a10e075 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h -@@ -32,6 +32,8 @@ typedef unsigned short __kernel_gid16_t; +@@ -32,6 +32,8 @@ typedef unsigned short __kernel_g typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_gid_t __kernel_old_gid_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -314,7 +276,7 @@ index 0cc4bc2..a10e075 100644 typedef __kernel_uid_t __kernel_uid32_t; typedef __kernel_gid_t __kernel_gid32_t; typedef int __kernel_suseconds_t; -@@ -62,6 +64,8 @@ typedef unsigned int __kernel_gid32_t; +@@ -62,6 +64,8 @@ typedef unsigned int __kernel_gid typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; typedef __kernel_dev_t __kernel_old_dev_t; @@ -323,8 +285,6 @@ index 0cc4bc2..a10e075 100644 typedef long long __kernel_loff_t; #endif -diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h -index 3e851ab..780aa8a 100644 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h @@ -41,6 +41,8 @@ typedef unsigned int __kernel_gid32_t; @@ -336,8 +296,6 @@ index 3e851ab..780aa8a 100644 typedef struct { #ifdef __USE_ALL -diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h -index de800d7..0cae08c 100644 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h @@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t; @@ -349,8 +307,6 @@ index de800d7..0cae08c 100644 typedef long long __kernel_loff_t; typedef struct { -diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h -index 44f1075..ed38f2e 100644 --- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h +++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h @@ -33,6 +33,8 @@ typedef unsigned int __kernel_gid32_t; @@ -362,5 +318,3 @@ index 44f1075..ed38f2e 100644 typedef long long __kernel_loff_t; /* Beginning in 2.6 kernels, which is the first version that includes the --- -cgit v0.9.0.1-2-gef13 diff --git a/toolchain/uClibc/patches-0.9.33.2/980-mips64_fixes.patch b/toolchain/uClibc/patches-0.9.33.2/980-mips64_fixes.patch index 0895b8b4b1..8d8ba0cf4e 100644 --- a/toolchain/uClibc/patches-0.9.33.2/980-mips64_fixes.patch +++ b/toolchain/uClibc/patches-0.9.33.2/980-mips64_fixes.patch @@ -1,7 +1,6 @@ -diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in ---- uClibc-0.9.33.2.orig/extra/Configs/Config.in 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc-0.9.33.2/extra/Configs/Config.in 2012-10-01 12:17:14.000000000 +0200 -@@ -235,6 +235,9 @@ +--- a/extra/Configs/Config.in ++++ b/extra/Configs/Config.in +@@ -235,6 +235,9 @@ config TARGET_SUBARCH default "i486" if CONFIG_486 default "i586" if CONFIG_586 || CONFIG_586MMX default "i686" if TARGET_ARCH = "i386" @@ -11,10 +10,9 @@ diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Con default "" source "extra/Configs/Config.in.arch" -diff -Nur uClibc-0.9.33.2.orig/Rules.mak uClibc-0.9.33.2/Rules.mak ---- uClibc-0.9.33.2.orig/Rules.mak 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc-0.9.33.2/Rules.mak 2012-10-01 11:28:26.000000000 +0200 -@@ -118,7 +118,7 @@ +--- a/Rules.mak ++++ b/Rules.mak +@@ -118,7 +118,7 @@ export MAJOR_VERSION MINOR_VERSION SUBLE LIBC := libc SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) -- 2.11.0