diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-02-21 14:32:21 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-02-21 14:32:21 +0000 |
| commit | d0484c4cf651fc0f08bbd1a902417687a3d7f0ff (patch) | |
| tree | 2cd957ecc9ccc165c6194e2159a25ef0869151ae | |
| parent | da99fcd35a1dae5d03d26b6be44b7c4cacdcf5cd (diff) | |
| download | upstream-d0484c4cf651fc0f08bbd1a902417687a3d7f0ff.tar.gz upstream-d0484c4cf651fc0f08bbd1a902417687a3d7f0ff.tar.bz2 upstream-d0484c4cf651fc0f08bbd1a902417687a3d7f0ff.zip | |
uClibc: refresh patches for uClibc
SVN-Revision: 14588
21 files changed, 84 insertions, 298 deletions
diff --git a/toolchain/uClibc/patches/001-fix_mmap.patch b/toolchain/uClibc/patches/001-fix_mmap.patch index 4775e8c332..38cf60a96a 100644 --- a/toolchain/uClibc/patches/001-fix_mmap.patch +++ b/toolchain/uClibc/patches/001-fix_mmap.patch @@ -1,5 +1,5 @@ ---- uClibc-0.9.29.oorig/test/mmap/mmap2.c (revision 0) -+++ uClibc-0.9.29/test/mmap/mmap2.c (revision 18616) +--- /dev/null ++++ b/test/mmap/mmap2.c @@ -0,0 +1,41 @@ +/* When trying to map /dev/mem with offset 0xFFFFF000 on the ARM platform, mmap + * returns -EOVERFLOW. @@ -42,8 +42,8 @@ + close(fd); + return 0; +} ---- uClibc-0.9.29.oorig/libc/sysdeps/linux/arm/mmap.c (revision 18615) -+++ uClibc-0.9.29/libc/sysdeps/linux/arm/mmap.c (revision 18616) +--- a/libc/sysdeps/linux/arm/mmap.c ++++ b/libc/sysdeps/linux/arm/mmap.c @@ -27,7 +27,6 @@ __ptr_t mmap(__ptr_t addr, size_t len, i #elif defined (__NR_mmap2) @@ -71,8 +71,8 @@ } #elif defined (__NR_mmap) # define __NR__mmap __NR_mmap ---- uClibc-0.9.29.oorig/libc/sysdeps/linux/common/mmap64.c (revision 18615) -+++ uClibc-0.9.29/libc/sysdeps/linux/common/mmap64.c (revision 18616) +--- a/libc/sysdeps/linux/common/mmap64.c ++++ b/libc/sysdeps/linux/common/mmap64.c @@ -58,8 +58,13 @@ __ptr_t mmap64(__ptr_t addr, size_t len, __set_errno(EINVAL); return MAP_FAILED; diff --git a/toolchain/uClibc/patches/002-conditional_sched_affinity.patch b/toolchain/uClibc/patches/002-conditional_sched_affinity.patch index 509c42af52..dfd5bc9d1f 100644 --- a/toolchain/uClibc/patches/002-conditional_sched_affinity.patch +++ b/toolchain/uClibc/patches/002-conditional_sched_affinity.patch @@ -1,6 +1,5 @@ -diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_getaffinity.c uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_getaffinity.c ---- uClibc-0.9.29/libc/sysdeps/linux/common/sched_getaffinity.c 2007-02-12 16:52:32.000000000 -0600 -+++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_getaffinity.c 2007-05-09 18:05:09.397411811 -0500 +--- a/libc/sysdeps/linux/common/sched_getaffinity.c ++++ b/libc/sysdeps/linux/common/sched_getaffinity.c @@ -29,6 +29,7 @@ #include <sys/param.h> #include <sys/types.h> @@ -9,7 +8,7 @@ diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_getaffinity.c uClibc-0.9. libc_hidden_proto(memset) #define __NR___syscall_sched_getaffinity __NR_sched_getaffinity -@@ -48,5 +49,15 @@ +@@ -48,5 +49,15 @@ int sched_getaffinity(pid_t pid, size_t } return res; } @@ -25,9 +24,8 @@ diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_getaffinity.c uClibc-0.9. #endif + +#endif -diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_setaffinity.c uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_setaffinity.c ---- uClibc-0.9.29/libc/sysdeps/linux/common/sched_setaffinity.c 2007-02-12 16:52:32.000000000 -0600 -+++ uClibc-0.9.29-patched/libc/sysdeps/linux/common/sched_setaffinity.c 2007-05-09 18:05:09.397411811 -0500 +--- a/libc/sysdeps/linux/common/sched_setaffinity.c ++++ b/libc/sysdeps/linux/common/sched_setaffinity.c @@ -31,6 +31,7 @@ #include <sys/types.h> #include <alloca.h> @@ -36,7 +34,7 @@ diff -ur uClibc-0.9.29/libc/sysdeps/linux/common/sched_setaffinity.c uClibc-0.9. libc_hidden_proto(getpid) #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity -@@ -74,5 +75,14 @@ +@@ -74,5 +75,14 @@ int sched_setaffinity(pid_t pid, size_t return INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset); } diff --git a/toolchain/uClibc/patches/004-fix_gethostent_r_failure_retval.patch b/toolchain/uClibc/patches/004-fix_gethostent_r_failure_retval.patch index 7b246c1ad7..0f4222cdf9 100644 --- a/toolchain/uClibc/patches/004-fix_gethostent_r_failure_retval.patch +++ b/toolchain/uClibc/patches/004-fix_gethostent_r_failure_retval.patch @@ -1,7 +1,6 @@ -diff -ur uClibc-0.9.29/libc/inet/resolv.c uClibc-0.9.29-patched/libc/inet/resolv.c ---- uClibc-0.9.29/libc/inet/resolv.c 2007-04-23 12:01:05.000000000 -0500 -+++ uClibc-0.9.29-patched/libc/inet/resolv.c 2007-05-09 18:05:33.563404419 -0500 -@@ -1700,7 +1700,7 @@ +--- a/libc/inet/resolv.c ++++ b/libc/inet/resolv.c +@@ -1700,7 +1700,7 @@ void sethostent (int stay_open) int gethostent_r(struct hostent *result_buf, char *buf, size_t buflen, struct hostent **result, int *h_errnop) { diff --git a/toolchain/uClibc/patches/005-fix_internal_function_definition.patch b/toolchain/uClibc/patches/005-fix_internal_function_definition.patch index 9b88d826f1..fc66d1e7cc 100644 --- a/toolchain/uClibc/patches/005-fix_internal_function_definition.patch +++ b/toolchain/uClibc/patches/005-fix_internal_function_definition.patch @@ -1,7 +1,5 @@ -Index: uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h -=================================================================== ---- uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h (revision 18898) -+++ uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h (working copy) +--- a/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h ++++ b/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h @@ -42,6 +42,8 @@ /* define if target supports IEEE signed zero floats */ #define __UCLIBC_HAVE_SIGNED_ZERO__ @@ -11,10 +9,8 @@ Index: uClibc/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h +#endif #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */ -Index: uClibc/include/libc-symbols.h -=================================================================== ---- uClibc/include/libc-symbols.h (revision 18898) -+++ uClibc/include/libc-symbols.h (working copy) +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h @@ -22,6 +22,16 @@ #ifndef _LIBC_SYMBOLS_H #define _LIBC_SYMBOLS_H 1 diff --git a/toolchain/uClibc/patches/006-rm_whitespace.patch b/toolchain/uClibc/patches/006-rm_whitespace.patch index 6004f91e32..57b6d30f0b 100644 --- a/toolchain/uClibc/patches/006-rm_whitespace.patch +++ b/toolchain/uClibc/patches/006-rm_whitespace.patch @@ -1,6 +1,5 @@ -diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h ---- uClibc-0.9.29-0rig/include/assert.h 2005-11-03 23:42:46.000000000 +0100 -+++ uClibc-0.9.29/include/assert.h 2007-08-13 19:10:57.000000000 +0200 +--- a/include/assert.h ++++ b/include/assert.h @@ -31,7 +31,7 @@ #define _ASSERT_H 1 #include <features.h> @@ -10,7 +9,7 @@ diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h # define __ASSERT_VOID_CAST static_cast<void> #else # define __ASSERT_VOID_CAST (void) -@@ -59,13 +59,17 @@ +@@ -59,13 +59,17 @@ __END_DECLS (__ASSERT_VOID_CAST ((expr) ? 0 : \ (__assert (__STRING(expr), __FILE__, __LINE__, \ __ASSERT_FUNCTION), 0))) @@ -30,10 +29,9 @@ diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h # define __ASSERT_FUNCTION __PRETTY_FUNCTION__ # else # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L -diff -urN uClibc-0.9.29-0rig/include/complex.h uClibc-0.9.29/include/complex.h ---- uClibc-0.9.29-0rig/include/complex.h 2002-05-09 10:15:21.000000000 +0200 -+++ uClibc-0.9.29/include/complex.h 2007-08-13 17:55:29.000000000 +0200 -@@ -33,7 +33,7 @@ +--- a/include/complex.h ++++ b/include/complex.h +@@ -33,7 +33,7 @@ __BEGIN_DECLS /* We might need to add support for more compilers here. But since ISO C99 is out hopefully all maintained compilers will soon provide the data types `float complex' and `double complex'. */ @@ -42,9 +40,8 @@ diff -urN uClibc-0.9.29-0rig/include/complex.h uClibc-0.9.29/include/complex.h # define _Complex __complex__ #endif -diff -urN uClibc-0.9.29-0rig/include/features.h uClibc-0.9.29/include/features.h ---- uClibc-0.9.29-0rig/include/features.h 2006-11-29 22:10:04.000000000 +0100 -+++ uClibc-0.9.29/include/features.h 2007-08-13 17:55:51.000000000 +0200 +--- a/include/features.h ++++ b/include/features.h @@ -143,7 +143,7 @@ /* Convenience macros to test the versions of glibc and gcc. @@ -72,9 +69,8 @@ diff -urN uClibc-0.9.29-0rig/include/features.h uClibc-0.9.29/include/features.h && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ # define __USE_EXTERN_INLINES 1 #endif -diff -urN uClibc-0.9.29-0rig/include/tgmath.h uClibc-0.9.29/include/tgmath.h ---- uClibc-0.9.29-0rig/include/tgmath.h 2002-05-09 10:15:21.000000000 +0200 -+++ uClibc-0.9.29/include/tgmath.h 2007-08-13 17:56:17.000000000 +0200 +--- a/include/tgmath.h ++++ b/include/tgmath.h @@ -34,7 +34,7 @@ do not try this for now and instead concentrate only on GNU CC. Once we have more information support for other compilers might follow. */ diff --git a/toolchain/uClibc/patches/007-avr32.patch b/toolchain/uClibc/patches/007-avr32.patch index d275ac2302..ac8c9ef2fd 100644 --- a/toolchain/uClibc/patches/007-avr32.patch +++ b/toolchain/uClibc/patches/007-avr32.patch @@ -1,5 +1,3 @@ -diff --git a/Rules.mak b/Rules.mak -index d054bbb..55381cf 100644 --- a/Rules.mak +++ b/Rules.mak @@ -313,6 +313,12 @@ ifeq ($(TARGET_ARCH),frv) @@ -15,9 +13,6 @@ index d054bbb..55381cf 100644 # Keep the check_gcc from being needlessly executed ifndef PIEFLAG ifneq ($(UCLIBC_BUILD_PIE),y) -diff --git a/extra/Configs/Config.avr32 b/extra/Configs/Config.avr32 -new file mode 100644 -index 0000000..8d70e6e --- /dev/null +++ b/extra/Configs/Config.avr32 @@ -0,0 +1,31 @@ @@ -52,8 +47,6 @@ index 0000000..8d70e6e +config LINKRELAX + bool "Enable linker optimizations" + default y -diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in -index 8eab394..10c9f7b 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -16,6 +16,9 @@ config TARGET_alpha @@ -77,15 +70,10 @@ index 8eab394..10c9f7b 100644 if TARGET_bfin source "extra/Configs/Config.bfin" endif -diff --git a/extra/Configs/defconfigs/avr32 b/extra/Configs/defconfigs/avr32 -new file mode 100644 -index 0000000..0b890a2 --- /dev/null +++ b/extra/Configs/defconfigs/avr32 @@ -0,0 +1 @@ +TARGET_avr32=y -diff --git a/include/elf.h b/include/elf.h -index 19805d7..ab90160 100644 --- a/include/elf.h +++ b/include/elf.h @@ -354,6 +354,8 @@ typedef struct @@ -153,11 +141,9 @@ index 19805d7..ab90160 100644 /* Renesas H8/300 Relocations */ #define R_H8_NONE 0 -diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h -index 32c5bf8..eb43bd9 100644 --- a/ldso/include/dl-string.h +++ b/ldso/include/dl-string.h -@@ -285,7 +285,8 @@ static __always_inline char * _dl_simple_ltoahex(char * local, unsigned long i) +@@ -285,7 +285,8 @@ static __always_inline char * _dl_simple /* On some arches constant strings are referenced through the GOT. * This requires that load_addr must already be defined... */ #if defined(mc68000) || defined(__arm__) || defined(__thumb__) || \ @@ -167,8 +153,6 @@ index 32c5bf8..eb43bd9 100644 # define CONSTANT_STRING_GOT_FIXUP(X) \ if ((X) < (const char *) load_addr) (X) += load_addr # define NO_EARLY_SEND_STDERR -diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h -index b42416a..4404219 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -55,69 +55,69 @@ @@ -256,7 +240,7 @@ index b42416a..4404219 100644 size_t, bufsiz); #ifdef __UCLIBC_HAS_SSP__ -@@ -146,14 +146,14 @@ static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv, +@@ -146,14 +146,14 @@ static inline _syscall2(int, _dl_gettime #if defined(__UCLIBC_MMAP_HAS_6_ARGS__) && defined(__NR_mmap) # define __NR__dl_mmap __NR_mmap @@ -273,7 +257,7 @@ index b42416a..4404219 100644 int, prot, int, flags, int, fd, off_t, offset); /* Some architectures always use 12 as page shift for mmap2() eventhough the -@@ -164,7 +164,7 @@ static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, +@@ -164,7 +164,7 @@ static inline _syscall6(__ptr_t, __sysca # define MMAP2_PAGE_SHIFT 12 #endif @@ -282,7 +266,7 @@ index b42416a..4404219 100644 int flags, int fd, unsigned long offset) { if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) -@@ -177,8 +177,8 @@ static inline void * _dl_mmap(void * addr, unsigned long size, int prot, +@@ -177,8 +177,8 @@ static inline void * _dl_mmap(void * add #elif defined(__NR_mmap) # define __NR__dl_mmap_real __NR_mmap @@ -293,9 +277,6 @@ index b42416a..4404219 100644 int flags, int fd, unsigned long offset) { unsigned long buffer[6]; -diff --git a/ldso/ldso/avr32/dl-debug.h b/ldso/ldso/avr32/dl-debug.h -new file mode 100644 -index 0000000..fe35539 --- /dev/null +++ b/ldso/ldso/avr32/dl-debug.h @@ -0,0 +1,45 @@ @@ -344,9 +325,6 @@ index 0000000..fe35539 + "R_AVR32_RELATIVE", "R_AVR32_GLOB_DAT", "R_AVR32_JMP_SLOT", + "R_AVR32_ALIGN", +}; -diff --git a/ldso/ldso/avr32/dl-startup.h b/ldso/ldso/avr32/dl-startup.h -new file mode 100644 -index 0000000..3b9a641 --- /dev/null +++ b/ldso/ldso/avr32/dl-startup.h @@ -0,0 +1,112 @@ @@ -462,9 +440,6 @@ index 0000000..3b9a641 + * _dl_boot2, we can just return the address we're supposed to + * call. */ +#define START() return _dl_elf_main; -diff --git a/ldso/ldso/avr32/dl-syscalls.h b/ldso/ldso/avr32/dl-syscalls.h -new file mode 100644 -index 0000000..996bb87 --- /dev/null +++ b/ldso/ldso/avr32/dl-syscalls.h @@ -0,0 +1,6 @@ @@ -474,9 +449,6 @@ index 0000000..996bb87 +extern int _dl_errno; +#undef __set_errno +#define __set_errno(X) {(_dl_errno) = (X);} -diff --git a/ldso/ldso/avr32/dl-sysdep.h b/ldso/ldso/avr32/dl-sysdep.h -new file mode 100644 -index 0000000..1a30172 --- /dev/null +++ b/ldso/ldso/avr32/dl-sysdep.h @@ -0,0 +1,105 @@ @@ -585,9 +557,6 @@ index 0000000..1a30172 + *reloc_addr = load_off + rpnt->r_addend; + } while (--relative_count); +} -diff --git a/ldso/ldso/avr32/elfinterp.c b/ldso/ldso/avr32/elfinterp.c -new file mode 100644 -index 0000000..196292b --- /dev/null +++ b/ldso/ldso/avr32/elfinterp.c @@ -0,0 +1,191 @@ @@ -782,9 +751,6 @@ index 0000000..196292b + return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, + _dl_do_reloc); +} -diff --git a/ldso/ldso/avr32/resolve.S b/ldso/ldso/avr32/resolve.S -new file mode 100644 -index 0000000..e3cb7f4 --- /dev/null +++ b/ldso/ldso/avr32/resolve.S @@ -0,0 +1,28 @@ @@ -816,8 +782,6 @@ index 0000000..e3cb7f4 + popm r8-r12,lr + mov pc, ip + .size _dl_linux_resolve, . - _dl_linux_resolve -diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c -index 5cf1d04..d4294ec 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -217,7 +217,9 @@ DL_START(unsigned long args) @@ -831,11 +795,9 @@ index 5cf1d04..d4294ec 100644 /* OK, now do the relocations. We do not do a lazy binding here, so that once we are done, we have considerably more flexibility. */ -diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c -index f4e6cac..9cdc3fe 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c -@@ -1643,7 +1643,7 @@ int attribute_hidden __read_etc_hosts_r(FILE * fp, const char * name, int type, +@@ -1643,7 +1643,7 @@ int attribute_hidden __read_etc_hosts_r( *result=result_buf; ret=NETDB_SUCCESS; #ifdef __UCLIBC_HAS_IPV6__ @@ -844,7 +806,7 @@ index f4e6cac..9cdc3fe 100644 DPRINTF("Found INET6\n"); addr_list6[0] = in6; addr_list6[1] = 0; -@@ -1658,8 +1658,8 @@ int attribute_hidden __read_etc_hosts_r(FILE * fp, const char * name, int type, +@@ -1658,8 +1658,8 @@ int attribute_hidden __read_etc_hosts_r( } else { DPRINTF("Error\n"); ret=TRY_AGAIN; @@ -855,9 +817,6 @@ index f4e6cac..9cdc3fe 100644 if (action!=GETHOSTENT) { fclose(fp); -diff --git a/libc/string/avr32/Makefile b/libc/string/avr32/Makefile -new file mode 100644 -index 0000000..e19e9d9 --- /dev/null +++ b/libc/string/avr32/Makefile @@ -0,0 +1,26 @@ @@ -887,9 +846,6 @@ index 0000000..e19e9d9 +include $(top_builddir)Rules.mak +include ../Makefile.in +include $(top_srcdir)Makerules -diff --git a/libc/string/avr32/bcopy.S b/libc/string/avr32/bcopy.S -new file mode 100644 -index 0000000..87c1e04 --- /dev/null +++ b/libc/string/avr32/bcopy.S @@ -0,0 +1,26 @@ @@ -919,9 +875,6 @@ index 0000000..87c1e04 + .size bcopy, . - bcopy + +#endif /* __UCLIBC_SUSV3_LEGACY__ */ -diff --git a/libc/string/avr32/bzero.S b/libc/string/avr32/bzero.S -new file mode 100644 -index 0000000..c999e65 --- /dev/null +++ b/libc/string/avr32/bzero.S @@ -0,0 +1,22 @@ @@ -947,9 +900,6 @@ index 0000000..c999e65 + .size bzero, . - bzero + +#endif /* __UCLIBC_SUSV3_LEGACY__ */ -diff --git a/libc/string/avr32/memcmp.S b/libc/string/avr32/memcmp.S -new file mode 100644 -index 0000000..ae6cc91 --- /dev/null +++ b/libc/string/avr32/memcmp.S @@ -0,0 +1,61 @@ @@ -1014,9 +964,6 @@ index 0000000..ae6cc91 +#ifdef __UCLIBC_SUSV3_LEGACY__ +strong_alias(memcmp,bcmp) +#endif -diff --git a/libc/string/avr32/memcpy.S b/libc/string/avr32/memcpy.S -new file mode 100644 -index 0000000..bf091ab --- /dev/null +++ b/libc/string/avr32/memcpy.S @@ -0,0 +1,111 @@ @@ -1131,9 +1078,6 @@ index 0000000..bf091ab + .size memcpy, . - memcpy + +libc_hidden_def(memcpy) -diff --git a/libc/string/avr32/memmove.S b/libc/string/avr32/memmove.S -new file mode 100644 -index 0000000..98287c5 --- /dev/null +++ b/libc/string/avr32/memmove.S @@ -0,0 +1,116 @@ @@ -1253,9 +1197,6 @@ index 0000000..98287c5 + .size memmove, . - memmove + +libc_hidden_def(memmove) -diff --git a/libc/string/avr32/memset.S b/libc/string/avr32/memset.S -new file mode 100644 -index 0000000..33cfaed --- /dev/null +++ b/libc/string/avr32/memset.S @@ -0,0 +1,70 @@ @@ -1329,9 +1270,6 @@ index 0000000..33cfaed + .size memset, . - memset + +libc_hidden_def(memset) -diff --git a/libc/string/avr32/strcmp.S b/libc/string/avr32/strcmp.S -new file mode 100644 -index 0000000..f73bd43 --- /dev/null +++ b/libc/string/avr32/strcmp.S @@ -0,0 +1,91 @@ @@ -1426,9 +1364,6 @@ index 0000000..f73bd43 +strong_alias(strcmp, strcoll) +libc_hidden_def(strcoll) +#endif -diff --git a/libc/string/avr32/strlen.S b/libc/string/avr32/strlen.S -new file mode 100644 -index 0000000..5223e53 --- /dev/null +++ b/libc/string/avr32/strlen.S @@ -0,0 +1,62 @@ @@ -1494,9 +1429,6 @@ index 0000000..5223e53 + .size strlen, . - strlen + +libc_hidden_def(strlen) -diff --git a/libc/sysdeps/linux/avr32/Makefile b/libc/sysdeps/linux/avr32/Makefile -new file mode 100644 -index 0000000..338abc0 --- /dev/null +++ b/libc/sysdeps/linux/avr32/Makefile @@ -0,0 +1,25 @@ @@ -1525,9 +1457,6 @@ index 0000000..338abc0 +include $(top_builddir)Rules.mak +include Makefile.arch +include $(top_srcdir)Makerules -diff --git a/libc/sysdeps/linux/avr32/Makefile.arch b/libc/sysdeps/linux/avr32/Makefile.arch -new file mode 100644 -index 0000000..44fc01e --- /dev/null +++ b/libc/sysdeps/linux/avr32/Makefile.arch @@ -0,0 +1,13 @@ @@ -1544,9 +1473,6 @@ index 0000000..44fc01e + sigrestorer.S syscall.S vfork.S + +include $(top_srcdir)/libc/sysdeps/linux/Makefile.commonarch -diff --git a/libc/sysdeps/linux/avr32/__longjmp.S b/libc/sysdeps/linux/avr32/__longjmp.S -new file mode 100644 -index 0000000..6154bb2 --- /dev/null +++ b/libc/sysdeps/linux/avr32/__longjmp.S @@ -0,0 +1,21 @@ @@ -1571,9 +1497,6 @@ index 0000000..6154bb2 + .size __longjmp, . - __longjmp + +libc_hidden_def(__longjmp) -diff --git a/libc/sysdeps/linux/avr32/bits/atomic.h b/libc/sysdeps/linux/avr32/bits/atomic.h -new file mode 100644 -index 0000000..e6be41f --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/atomic.h @@ -0,0 +1,120 @@ @@ -1697,9 +1620,6 @@ index 0000000..e6be41f + }) + +#endif /* _AVR32_BITS_ATOMIC_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/byteswap.h b/libc/sysdeps/linux/avr32/bits/byteswap.h -new file mode 100644 -index 0000000..1c030b9 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/byteswap.h @@ -0,0 +1,70 @@ @@ -1773,9 +1693,6 @@ index 0000000..1c030b9 +#endif + +#endif /* _BITS_BYTESWAP_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/endian.h b/libc/sysdeps/linux/avr32/bits/endian.h -new file mode 100644 -index 0000000..7bb6358 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/endian.h @@ -0,0 +1,7 @@ @@ -1786,9 +1703,6 @@ index 0000000..7bb6358 +#endif + +#define __BYTE_ORDER __BIG_ENDIAN -diff --git a/libc/sysdeps/linux/avr32/bits/fcntl.h b/libc/sysdeps/linux/avr32/bits/fcntl.h -new file mode 100644 -index 0000000..1abff17 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/fcntl.h @@ -0,0 +1,165 @@ @@ -1957,9 +1871,6 @@ index 0000000..1abff17 +# define POSIX_FADV_DONTNEED 4 /* Don't need these pages. */ +# define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ +#endif -diff --git a/libc/sysdeps/linux/avr32/bits/kernel_stat.h b/libc/sysdeps/linux/avr32/bits/kernel_stat.h -new file mode 100644 -index 0000000..f97d23b --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/kernel_stat.h @@ -0,0 +1,67 @@ @@ -2030,9 +1941,6 @@ index 0000000..f97d23b +}; + +#endif /* _BITS_STAT_STRUCT_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h -new file mode 100644 -index 0000000..f7d8b52 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h @@ -0,0 +1,55 @@ @@ -2091,9 +1999,6 @@ index 0000000..f7d8b52 +} __kernel_fsid_t; + +#endif /* __ASM_AVR32_POSIX_TYPES_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/mman.h b/libc/sysdeps/linux/avr32/bits/mman.h -new file mode 100644 -index 0000000..5f6e3c3 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/mman.h @@ -0,0 +1,103 @@ @@ -2200,9 +2105,6 @@ index 0000000..5f6e3c3 +# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ +# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ +#endif -diff --git a/libc/sysdeps/linux/avr32/bits/setjmp.h b/libc/sysdeps/linux/avr32/bits/setjmp.h -new file mode 100644 -index 0000000..78348a3 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/setjmp.h @@ -0,0 +1,30 @@ @@ -2236,9 +2138,6 @@ index 0000000..78348a3 + ((void *)(address) < (void *)(jmpbuf[__JMP_BUF_SP])) + +#endif /* _BITS_SETJMP_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/stackinfo.h b/libc/sysdeps/linux/avr32/bits/stackinfo.h -new file mode 100644 -index 0000000..29b8452 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/stackinfo.h @@ -0,0 +1,28 @@ @@ -2270,9 +2169,6 @@ index 0000000..29b8452 +#define _STACK_GROWS_DOWN 1 + +#endif /* stackinfo.h */ -diff --git a/libc/sysdeps/linux/avr32/bits/syscalls.h b/libc/sysdeps/linux/avr32/bits/syscalls.h -new file mode 100644 -index 0000000..22ac059 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/syscalls.h @@ -0,0 +1,143 @@ @@ -2419,9 +2315,6 @@ index 0000000..22ac059 + +#endif /* __ASSEMBLER__ */ +#endif /* _BITS_SYSCALLS_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h b/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h -new file mode 100644 -index 0000000..e95e8a5 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/uClibc_arch_features.h @@ -0,0 +1,45 @@ @@ -2470,16 +2363,10 @@ index 0000000..e95e8a5 +#define __UCLIBC_HAVE_SIGNED_ZERO__ + +#endif /* _BITS_UCLIBC_ARCH_FEATURES_H */ -diff --git a/libc/sysdeps/linux/avr32/bits/wordsize.h b/libc/sysdeps/linux/avr32/bits/wordsize.h -new file mode 100644 -index 0000000..1b5842a --- /dev/null +++ b/libc/sysdeps/linux/avr32/bits/wordsize.h @@ -0,0 +1 @@ +#define __WORDSIZE 32 -diff --git a/libc/sysdeps/linux/avr32/brk.c b/libc/sysdeps/linux/avr32/brk.c -new file mode 100644 -index 0000000..a54b49a --- /dev/null +++ b/libc/sysdeps/linux/avr32/brk.c @@ -0,0 +1,31 @@ @@ -2514,9 +2401,6 @@ index 0000000..a54b49a + return 0; +} +libc_hidden_def(brk) -diff --git a/libc/sysdeps/linux/avr32/bsd-_setjmp.S b/libc/sysdeps/linux/avr32/bsd-_setjmp.S -new file mode 100644 -index 0000000..be66a10 --- /dev/null +++ b/libc/sysdeps/linux/avr32/bsd-_setjmp.S @@ -0,0 +1,16 @@ @@ -2536,9 +2420,6 @@ index 0000000..be66a10 + mov r11, 0 + bral __GI___sigsetjmp + .size _setjmp, . - _setjmp -diff --git a/libc/sysdeps/linux/avr32/bsd-setjmp.S b/libc/sysdeps/linux/avr32/bsd-setjmp.S -new file mode 100644 -index 0000000..4635eeb --- /dev/null +++ b/libc/sysdeps/linux/avr32/bsd-setjmp.S @@ -0,0 +1,16 @@ @@ -2558,9 +2439,6 @@ index 0000000..4635eeb + mov r11, 1 + bral __GI___sigsetjmp + .size setjmp, . - setjmp -diff --git a/libc/sysdeps/linux/avr32/clone.c b/libc/sysdeps/linux/avr32/clone.c -new file mode 100644 -index 0000000..e43b0f3 --- /dev/null +++ b/libc/sysdeps/linux/avr32/clone.c @@ -0,0 +1,41 @@ @@ -2605,9 +2483,6 @@ index 0000000..e43b0f3 + __set_errno (-err); + return -1; +} -diff --git a/libc/sysdeps/linux/avr32/crt1.S b/libc/sysdeps/linux/avr32/crt1.S -new file mode 100644 -index 0000000..ca1fa7a --- /dev/null +++ b/libc/sysdeps/linux/avr32/crt1.S @@ -0,0 +1,97 @@ @@ -2708,9 +2583,6 @@ index 0000000..ca1fa7a +3: .long 0 /* Linux executable */ + .long 2,6,0 /* Earliest compatible kernel */ +4: .align 4 -diff --git a/libc/sysdeps/linux/avr32/crti.S b/libc/sysdeps/linux/avr32/crti.S -new file mode 100644 -index 0000000..660f47c --- /dev/null +++ b/libc/sysdeps/linux/avr32/crti.S @@ -0,0 +1,26 @@ @@ -2740,9 +2612,6 @@ index 0000000..660f47c + .align 2 +2: .long 1b - _GLOBAL_OFFSET_TABLE_ +3: -diff --git a/libc/sysdeps/linux/avr32/crtn.S b/libc/sysdeps/linux/avr32/crtn.S -new file mode 100644 -index 0000000..f7d1040 --- /dev/null +++ b/libc/sysdeps/linux/avr32/crtn.S @@ -0,0 +1,14 @@ @@ -2760,9 +2629,6 @@ index 0000000..f7d1040 + .type _fini, @function + ldm sp++, r6, pc + .size _fini, . - _fini -diff --git a/libc/sysdeps/linux/avr32/mmap.c b/libc/sysdeps/linux/avr32/mmap.c -new file mode 100644 -index 0000000..2ee025a --- /dev/null +++ b/libc/sysdeps/linux/avr32/mmap.c @@ -0,0 +1,33 @@ @@ -2799,9 +2665,6 @@ index 0000000..2ee025a + return mmap2(addr, len, prot, flags, fd, pgoff); +} +libc_hidden_def(mmap) -diff --git a/libc/sysdeps/linux/avr32/setjmp.S b/libc/sysdeps/linux/avr32/setjmp.S -new file mode 100644 -index 0000000..7d0354b --- /dev/null +++ b/libc/sysdeps/linux/avr32/setjmp.S @@ -0,0 +1,29 @@ @@ -2834,9 +2697,6 @@ index 0000000..7d0354b + .size __sigsetjmp, . - __sigsetjmp + +libc_hidden_def(__sigsetjmp) -diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c -new file mode 100644 -index 0000000..a97ff3d --- /dev/null +++ b/libc/sysdeps/linux/avr32/sigaction.c @@ -0,0 +1,59 @@ @@ -2899,9 +2759,6 @@ index 0000000..a97ff3d +weak_alias(__libc_sigaction, sigaction) +libc_hidden_weak(sigaction) +#endif -diff --git a/libc/sysdeps/linux/avr32/sigrestorer.S b/libc/sysdeps/linux/avr32/sigrestorer.S -new file mode 100644 -index 0000000..df6a1ba --- /dev/null +++ b/libc/sysdeps/linux/avr32/sigrestorer.S @@ -0,0 +1,15 @@ @@ -2920,9 +2777,6 @@ index 0000000..df6a1ba +__default_rt_sa_restorer: + mov r8, __NR_rt_sigreturn + scall -diff --git a/libc/sysdeps/linux/avr32/sys/elf.h b/libc/sysdeps/linux/avr32/sys/elf.h -new file mode 100644 -index 0000000..faa7310 --- /dev/null +++ b/libc/sysdeps/linux/avr32/sys/elf.h @@ -0,0 +1,26 @@ @@ -2952,9 +2806,6 @@ index 0000000..faa7310 +#include <sys/procfs.h> + +#endif /* sys/elf.h */ -diff --git a/libc/sysdeps/linux/avr32/sys/procfs.h b/libc/sysdeps/linux/avr32/sys/procfs.h -new file mode 100644 -index 0000000..3b37363 --- /dev/null +++ b/libc/sysdeps/linux/avr32/sys/procfs.h @@ -0,0 +1,123 @@ @@ -3081,9 +2932,6 @@ index 0000000..3b37363 +__END_DECLS + +#endif /* sys/procfs.h */ -diff --git a/libc/sysdeps/linux/avr32/sys/ucontext.h b/libc/sysdeps/linux/avr32/sys/ucontext.h -new file mode 100644 -index 0000000..82c7fe2 --- /dev/null +++ b/libc/sysdeps/linux/avr32/sys/ucontext.h @@ -0,0 +1,90 @@ @@ -3177,9 +3025,6 @@ index 0000000..82c7fe2 +} ucontext_t; + +#endif /* sys/ucontext.h */ -diff --git a/libc/sysdeps/linux/avr32/sys/user.h b/libc/sysdeps/linux/avr32/sys/user.h -new file mode 100644 -index 0000000..c0b3d38 --- /dev/null +++ b/libc/sysdeps/linux/avr32/sys/user.h @@ -0,0 +1,46 @@ @@ -3229,9 +3074,6 @@ index 0000000..c0b3d38 +}; + +#endif /* _SYS_USER_H */ -diff --git a/libc/sysdeps/linux/avr32/syscall.S b/libc/sysdeps/linux/avr32/syscall.S -new file mode 100644 -index 0000000..55c1b1f --- /dev/null +++ b/libc/sysdeps/linux/avr32/syscall.S @@ -0,0 +1,71 @@ @@ -3306,9 +3148,6 @@ index 0000000..55c1b1f + + + .size syscall, . - syscall -diff --git a/libc/sysdeps/linux/avr32/vfork.S b/libc/sysdeps/linux/avr32/vfork.S -new file mode 100644 -index 0000000..03ca99f --- /dev/null +++ b/libc/sysdeps/linux/avr32/vfork.S @@ -0,0 +1,58 @@ @@ -3370,9 +3209,6 @@ index 0000000..03ca99f + +weak_alias(__vfork,vfork) +libc_hidden_weak(vfork) -diff --git a/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h -new file mode 100644 -index 0000000..eccf329 --- /dev/null +++ b/libpthread/linuxthreads.old/sysdeps/avr32/pt-machine.h @@ -0,0 +1,73 @@ @@ -3449,9 +3285,6 @@ index 0000000..eccf329 +} + +#endif /* pt-machine.h */ -diff --git a/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h -new file mode 100644 -index 0000000..fe12bf8 --- /dev/null +++ b/libpthread/linuxthreads/sysdeps/avr32/pt-machine.h @@ -0,0 +1,73 @@ @@ -3528,8 +3361,6 @@ index 0000000..fe12bf8 +} + +#endif /* pt-machine.h */ -diff --git a/utils/ldd.c b/utils/ldd.c -index 75ad628..e34acd9 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -44,6 +44,11 @@ diff --git a/toolchain/uClibc/patches/008-avr32_fix_sa_onstack.patch b/toolchain/uClibc/patches/008-avr32_fix_sa_onstack.patch index 722decdbd7..5a30861e16 100644 --- a/toolchain/uClibc/patches/008-avr32_fix_sa_onstack.patch +++ b/toolchain/uClibc/patches/008-avr32_fix_sa_onstack.patch @@ -13,11 +13,9 @@ Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> libc/sysdeps/linux/avr32/sigaction.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c -index a97ff3d..6dcca91 100644 --- a/libc/sysdeps/linux/avr32/sigaction.c +++ b/libc/sysdeps/linux/avr32/sigaction.c -@@ -30,7 +30,7 @@ int __libc_sigaction(int signum, const struct sigaction *act, +@@ -30,7 +30,7 @@ int __libc_sigaction(int signum, const s kact.k_sa_handler = act->sa_handler; memcpy(&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask)); kact.sa_flags = act->sa_flags; @@ -26,6 +24,3 @@ index a97ff3d..6dcca91 100644 kact.sa_restorer = act->sa_restorer; else kact.sa_restorer = __default_rt_sa_restorer; --- -1.5.3.4 - diff --git a/toolchain/uClibc/patches/009-fix_getaddrinfo_infinite_loop.patch b/toolchain/uClibc/patches/009-fix_getaddrinfo_infinite_loop.patch index 27830b3c16..5d702a3ace 100644 --- a/toolchain/uClibc/patches/009-fix_getaddrinfo_infinite_loop.patch +++ b/toolchain/uClibc/patches/009-fix_getaddrinfo_infinite_loop.patch @@ -1,7 +1,6 @@ -diff -ruN uClibc-0.9.29.orig/libc/inet/getaddrinfo.c uClibc-0.9.29/libc/inet/getaddrinfo.c ---- uClibc-0.9.29.orig/libc/inet/getaddrinfo.c 2006-01-22 20:35:08.000000000 +0100 -+++ uClibc-0.9.29/libc/inet/getaddrinfo.c 2008-05-11 03:33:18.000000000 +0200 -@@ -858,7 +858,10 @@ +--- a/libc/inet/getaddrinfo.c ++++ b/libc/inet/getaddrinfo.c +@@ -858,7 +858,10 @@ getaddrinfo (const char *name, const cha if (hints->ai_family == g->family || hints->ai_family == AF_UNSPEC) { if ((hints->ai_flags & AI_ADDRCONFIG) && !addrconfig(g->family)) diff --git a/toolchain/uClibc/patches/100-termios.patch b/toolchain/uClibc/patches/100-termios.patch index bbe98ff7ee..413c124a1f 100644 --- a/toolchain/uClibc/patches/100-termios.patch +++ b/toolchain/uClibc/patches/100-termios.patch @@ -1,8 +1,6 @@ -Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h -=================================================================== ---- uClibc-0.9.29.orig/libc/sysdeps/linux/common/bits/termios.h 2007-12-29 01:46:19.616052472 +0100 -+++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2007-12-29 01:46:30.512673426 +0100 -@@ -156,7 +156,6 @@ +--- a/libc/sysdeps/linux/common/bits/termios.h ++++ b/libc/sysdeps/linux/common/bits/termios.h +@@ -156,7 +156,6 @@ struct termios #endif #define B57600 0010001 #define B115200 0010002 @@ -10,7 +8,7 @@ Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h #define B230400 0010003 #define B460800 0010004 #define B500000 0010005 -@@ -171,9 +170,6 @@ +@@ -171,9 +170,6 @@ struct termios #define B3500000 0010016 #define B4000000 0010017 #define __MAX_BAUD B4000000 diff --git a/toolchain/uClibc/patches/110-compat_macros.patch b/toolchain/uClibc/patches/110-compat_macros.patch index ebb0f3114c..032de4113f 100644 --- a/toolchain/uClibc/patches/110-compat_macros.patch +++ b/toolchain/uClibc/patches/110-compat_macros.patch @@ -1,8 +1,6 @@ -Index: uClibc-0.9.29/include/string.h -=================================================================== ---- uClibc-0.9.29.orig/include/string.h 2007-12-30 00:44:19.638696968 +0100 -+++ uClibc-0.9.29/include/string.h 2007-12-30 01:12:52.097715154 +0100 -@@ -320,18 +320,40 @@ +--- a/include/string.h ++++ b/include/string.h +@@ -320,18 +320,40 @@ extern char *index (__const char *__s, i /* Find the last occurrence of C in S (same as strrchr). */ extern char *rindex (__const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); @@ -51,11 +49,9 @@ Index: uClibc-0.9.29/include/string.h # endif /* Return the position of the first bit set in I, or 0 if none are set. -Index: uClibc-0.9.29/include/strings.h -=================================================================== ---- uClibc-0.9.29.orig/include/strings.h 2007-12-30 00:49:00.462700217 +0100 -+++ uClibc-0.9.29/include/strings.h 2007-12-30 00:52:57.844227820 +0100 -@@ -58,11 +58,36 @@ +--- a/include/strings.h ++++ b/include/strings.h +@@ -58,11 +58,36 @@ extern char *rindex (__const char *__s, * They are replaced as proposed by SuSv3. Don't sync this part * with glibc and keep it in sync with string.h. */ diff --git a/toolchain/uClibc/patches/120-adjtimex.patch b/toolchain/uClibc/patches/120-adjtimex.patch index 5127701dfc..38136079ae 100644 --- a/toolchain/uClibc/patches/120-adjtimex.patch +++ b/toolchain/uClibc/patches/120-adjtimex.patch @@ -1,8 +1,6 @@ -Index: uClibc-0.9.29/include/sys/timex.h -=================================================================== ---- uClibc-0.9.29.orig/include/sys/timex.h 2007-12-30 17:34:21.983513096 +0100 -+++ uClibc-0.9.29/include/sys/timex.h 2007-12-30 17:34:32.180094169 +0100 -@@ -116,7 +116,8 @@ +--- a/include/sys/timex.h ++++ b/include/sys/timex.h +@@ -116,7 +116,8 @@ struct timex __BEGIN_DECLS diff --git a/toolchain/uClibc/patches/130-compile_fixes.patch b/toolchain/uClibc/patches/130-compile_fixes.patch index 7e32e329a1..8a61291af8 100644 --- a/toolchain/uClibc/patches/130-compile_fixes.patch +++ b/toolchain/uClibc/patches/130-compile_fixes.patch @@ -1,7 +1,5 @@ -Index: uClibc-0.9.29/libc/string/mips/sysdep.h -=================================================================== ---- uClibc-0.9.29.orig/libc/string/mips/sysdep.h 2007-12-30 20:10:30.969471579 +0100 -+++ uClibc-0.9.29/libc/string/mips/sysdep.h 2007-12-30 20:10:37.717856150 +0100 +--- a/libc/string/mips/sysdep.h ++++ b/libc/string/mips/sysdep.h @@ -29,7 +29,7 @@ .globl name; \ .align 2; \ @@ -11,11 +9,9 @@ Index: uClibc-0.9.29/libc/string/mips/sysdep.h #undef END #define END(function) \ -Index: uClibc-0.9.29/Rules.mak -=================================================================== ---- uClibc-0.9.29.orig/Rules.mak 2007-12-30 20:22:54.727521234 +0100 -+++ uClibc-0.9.29/Rules.mak 2007-12-30 20:23:05.320124876 +0100 -@@ -399,7 +399,7 @@ +--- a/Rules.mak ++++ b/Rules.mak +@@ -399,7 +399,7 @@ ifneq ($(HAVE_SHARED),y) CFLAGS += -DSTATIC endif diff --git a/toolchain/uClibc/patches/130-sockets_throw.patch b/toolchain/uClibc/patches/130-sockets_throw.patch index 4072804e47..7735b60135 100644 --- a/toolchain/uClibc/patches/130-sockets_throw.patch +++ b/toolchain/uClibc/patches/130-sockets_throw.patch @@ -1,7 +1,6 @@ -diff -urN uClibc-0.9.29/libc/sysdeps/linux/mips/bits/socket.h uClibc-0.9.29.new/libc/sysdeps/linux/mips/bits/socket.h ---- uClibc-0.9.29/libc/sysdeps/linux/mips/bits/socket.h 2006-12-06 22:46:56.000000000 +0100 -+++ uClibc-0.9.29.new/libc/sysdeps/linux/mips/bits/socket.h 2007-12-31 14:25:29.000000000 +0100 -@@ -269,7 +269,7 @@ +--- a/libc/sysdeps/linux/mips/bits/socket.h ++++ b/libc/sysdeps/linux/mips/bits/socket.h +@@ -269,7 +269,7 @@ struct cmsghdr #define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len)) extern struct cmsghdr * __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, diff --git a/toolchain/uClibc/patches/131-arm_ftruncate64.patch b/toolchain/uClibc/patches/131-arm_ftruncate64.patch index 504d37bcd2..5b23421ba2 100644 --- a/toolchain/uClibc/patches/131-arm_ftruncate64.patch +++ b/toolchain/uClibc/patches/131-arm_ftruncate64.patch @@ -1,7 +1,5 @@ -Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h -=================================================================== ---- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h -+++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +--- a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h ++++ b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h @@ -38,4 +38,8 @@ /* define if target supports IEEE signed zero floats */ #define __UCLIBC_HAVE_SIGNED_ZERO__ diff --git a/toolchain/uClibc/patches/132-arm_fix_alignment.patch b/toolchain/uClibc/patches/132-arm_fix_alignment.patch index 5f70564f47..acf3654df0 100644 --- a/toolchain/uClibc/patches/132-arm_fix_alignment.patch +++ b/toolchain/uClibc/patches/132-arm_fix_alignment.patch @@ -1,5 +1,5 @@ ---- uClibc-0.9.29/ldso/ldso/arm/dl-sysdep.h.orig 2006-11-21 02:50:42.000000000 +0000 -+++ uClibc-0.9.29/ldso/ldso/arm/dl-sysdep.h 2008-09-07 10:03:55.000000000 +0100 +--- a/ldso/ldso/arm/dl-sysdep.h ++++ b/ldso/ldso/arm/dl-sysdep.h @@ -15,6 +15,8 @@ GOT_BASE[1] = (unsigned long) MODULE; \ } diff --git a/toolchain/uClibc/patches/133-unistd_arm.patch b/toolchain/uClibc/patches/133-unistd_arm.patch index 7aef8b01bb..a152888801 100644 --- a/toolchain/uClibc/patches/133-unistd_arm.patch +++ b/toolchain/uClibc/patches/133-unistd_arm.patch @@ -1,8 +1,6 @@ -Index: uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh -=================================================================== ---- uClibc-0.9.29.orig/extra/scripts/gen_bits_syscall_h.sh 2006-12-12 04:30:02.000000000 +0100 -+++ uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh 2008-03-10 23:20:52.000000000 +0100 -@@ -24,8 +24,8 @@ +--- a/extra/scripts/gen_bits_syscall_h.sh ++++ b/extra/scripts/gen_bits_syscall_h.sh +@@ -24,8 +24,8 @@ esac ( echo "#include <asm/unistd.h>"; echo "#include <asm/unistd.h>" | $CC -E $CC_SYSNUM_ARGS $INCLUDE_OPTS - | @@ -13,7 +11,7 @@ Index: uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh ) | $CC -E $INCLUDE_OPTS - | ( echo "/* WARNING!!! AUTO-GENERATED FILE!!! DO NOT EDIT!!! */" ; echo ; -@@ -35,10 +35,10 @@ +@@ -35,10 +35,10 @@ $CC -E $INCLUDE_OPTS - | echo "#ifndef _SYSCALL_H" ; echo "# error \"Never use <bits/sysnum.h> directly; include <sys/syscall.h> instead.\"" ; echo "#endif" ; echo ; @@ -28,4 +26,3 @@ Index: uClibc-0.9.29/extra/scripts/gen_bits_syscall_h.sh echo ; echo "#endif" ; ) - diff --git a/toolchain/uClibc/patches/140-fix-endless-recursion-in-pthread.patch b/toolchain/uClibc/patches/140-fix-endless-recursion-in-pthread.patch index 9a61a40a39..c967e1b636 100644 --- a/toolchain/uClibc/patches/140-fix-endless-recursion-in-pthread.patch +++ b/toolchain/uClibc/patches/140-fix-endless-recursion-in-pthread.patch @@ -1,7 +1,6 @@ -diff -urN uClibc-0.9.29.orig/libpthread/linuxthreads.old/pthread.c uClibc-0.9.29/libpthread/linuxthreads.old/pthread.c ---- uClibc-0.9.29.orig/libpthread/linuxthreads.old/pthread.c 2008-09-18 06:18:00.000000000 +0200 -+++ uClibc-0.9.29/libpthread/linuxthreads.old/pthread.c 2008-09-18 06:19:06.000000000 +0200 -@@ -335,9 +335,9 @@ +--- a/libpthread/linuxthreads.old/pthread.c ++++ b/libpthread/linuxthreads.old/pthread.c +@@ -335,9 +335,9 @@ struct pthread_functions __pthread_funct .ptr_pthread_raise = pthread_raise, .ptr__pthread_cleanup_push = _pthread_cleanup_push, .ptr__pthread_cleanup_pop = _pthread_cleanup_pop diff --git a/toolchain/uClibc/patches/150-fix-ldso-text-realloc-segfault.patch b/toolchain/uClibc/patches/150-fix-ldso-text-realloc-segfault.patch index ce5fb30460..7006f98b1a 100644 --- a/toolchain/uClibc/patches/150-fix-ldso-text-realloc-segfault.patch +++ b/toolchain/uClibc/patches/150-fix-ldso-text-realloc-segfault.patch @@ -1,7 +1,6 @@ -diff -urN uClibc-0.9.29.old/ldso/ldso/ldso.c uClibc-0.9.29/ldso/ldso/ldso.c ---- uClibc-0.9.29.old/ldso/ldso/ldso.c 2008-09-25 01:02:42.000000000 +0200 -+++ uClibc-0.9.29/ldso/ldso/ldso.c 2008-09-24 23:55:11.000000000 +0200 -@@ -286,15 +286,20 @@ +--- a/ldso/ldso/ldso.c ++++ b/ldso/ldso/ldso.c +@@ -286,15 +286,20 @@ void _dl_get_ready_to_run(struct elf_res _dl_debug_early("calling mprotect on the application program\n"); /* Now cover the application program. */ if (app_tpnt->dynamic_info[DT_TEXTREL]) { diff --git a/toolchain/uClibc/patches/170-enable-getifaddrs.patch b/toolchain/uClibc/patches/170-enable-getifaddrs.patch index da393feba9..5b0d4fc536 100644 --- a/toolchain/uClibc/patches/170-enable-getifaddrs.patch +++ b/toolchain/uClibc/patches/170-enable-getifaddrs.patch @@ -1,7 +1,5 @@ -Index: uclibc/libc/inet/ifaddrs.c -=================================================================== ---- uclibc.orig/libc/inet/ifaddrs.c -+++ uclibc/libc/inet/ifaddrs.c +--- a/libc/inet/ifaddrs.c ++++ b/libc/inet/ifaddrs.c @@ -38,6 +38,7 @@ #include <unistd.h> @@ -61,10 +59,8 @@ Index: uclibc/libc/inet/ifaddrs.c -#endif /* unused code */ - #endif /* __ASSUME_NETLINK_SUPPORT */ -Index: uclibc/libc/inet/netlinkaccess.h -=================================================================== ---- uclibc.orig/libc/inet/netlinkaccess.h -+++ uclibc/libc/inet/netlinkaccess.h +--- a/libc/inet/netlinkaccess.h ++++ b/libc/inet/netlinkaccess.h @@ -61,14 +61,11 @@ struct netlink_handle }; @@ -80,10 +76,8 @@ Index: uclibc/libc/inet/netlinkaccess.h extern int __netlink_open (struct netlink_handle *h) attribute_hidden; extern void __netlink_close (struct netlink_handle *h) attribute_hidden; -Index: uclibc/include/ifaddrs.h -=================================================================== --- /dev/null -+++ uclibc/include/ifaddrs.h ++++ b/include/ifaddrs.h @@ -0,0 +1,74 @@ +/* ifaddrs.h -- declarations for getting network interface addresses + Copyright (C) 2002 Free Software Foundation, Inc. @@ -159,4 +153,3 @@ Index: uclibc/include/ifaddrs.h +__END_DECLS + +#endif /* ifaddrs.h */ - diff --git a/toolchain/uClibc/patches/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches/180-fix_kernel_types_with_recent_kernel.patch index 307279c725..24ed697ba1 100644 --- a/toolchain/uClibc/patches/180-fix_kernel_types_with_recent_kernel.patch +++ b/toolchain/uClibc/patches/180-fix_kernel_types_with_recent_kernel.patch @@ -1,7 +1,7 @@ This patch is out of uClibc trunk. ---- uClibc/libc/sysdeps/linux/i386/bits/kernel_types.h 2008/07/23 11:23:36 22935 -+++ uClibc/libc/sysdeps/linux/i386/bits/kernel_types.h 2008/12/23 09:04:50 24515 +--- a/libc/sysdeps/linux/i386/bits/kernel_types.h ++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h @@ -7,10 +7,14 @@ /* a hack for compiling a 32 bit user space with 64 bit diff --git a/toolchain/uClibc/patches/910-gcc_4_3_include_fixed.patch b/toolchain/uClibc/patches/910-gcc_4_3_include_fixed.patch index 3d6494419f..fd80c217f9 100644 --- a/toolchain/uClibc/patches/910-gcc_4_3_include_fixed.patch +++ b/toolchain/uClibc/patches/910-gcc_4_3_include_fixed.patch @@ -1,7 +1,6 @@ -diff -ruN uClibc-0.9.29-old/Rules.mak uClibc-0.9.29-new/Rules.mak ---- uClibc-0.9.29-old/Rules.mak 2009-01-17 16:18:36.662982000 +0100 -+++ uClibc-0.9.29-new/Rules.mak 2009-01-17 19:14:02.473165330 +0100 -@@ -498,7 +498,8 @@ +--- a/Rules.mak ++++ b/Rules.mak +@@ -498,7 +498,8 @@ CFLAGS += -I$(KERNEL_HEADERS) # Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include' #CFLAGS+=-iwithprefix include |