From d1369f342b52d11c4d42891c0cece22fc64aeb5b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 8 Feb 2009 22:07:29 +0000 Subject: Add patchset for uClibc-0.9.30 (from Gentoo). /trunk/patches/uClibc/0.9.30/110-arm_fix_alignment.patch | 23 23 0 0 +++ /trunk/patches/uClibc/0.9.30/130-arm-ftruncate64.patch | 17 17 0 0 ++ /trunk/patches/uClibc/0.9.30/100-fix-gethostent_r-failure-retval.patch | 17 17 0 0 ++ /trunk/patches/uClibc/0.9.30/120-rm-whitespace.patch | 88 88 0 0 ++++++++++ /trunk/patches/uClibc/0.9.30/140-gnu89-inline.patch | 16 16 0 0 ++ 5 files changed, 161 insertions(+) diff --git a/patches/uClibc/0.9.30/100-fix-gethostent_r-failure-retval.patch b/patches/uClibc/0.9.30/100-fix-gethostent_r-failure-retval.patch new file mode 100644 index 0000000..34e18d2 --- /dev/null +++ b/patches/uClibc/0.9.30/100-fix-gethostent_r-failure-retval.patch @@ -0,0 +1,17 @@ +Original patch from Gentoo. + +-= BEGIN original header =- +-= END original header =- + +diff -durN uClibc-0.9.30.orig/libc/inet/resolv.c uClibc-0.9.30/libc/inet/resolv.c +--- uClibc-0.9.30.orig/libc/inet/resolv.c 2008-11-02 01:25:33.000000000 +0100 ++++ uClibc-0.9.30/libc/inet/resolv.c 2009-02-07 09:57:59.000000000 +0100 +@@ -1788,7 +1788,7 @@ + int gethostent_r(struct hostent *result_buf, char *buf, size_t buflen, + struct hostent **result, int *h_errnop) + { +- int ret; ++ int ret = HOST_NOT_FOUND; + + __UCLIBC_MUTEX_LOCK(mylock); + if (__gethostent_fp == NULL) { diff --git a/patches/uClibc/0.9.30/110-arm_fix_alignment.patch b/patches/uClibc/0.9.30/110-arm_fix_alignment.patch new file mode 100644 index 0000000..0d72e7f --- /dev/null +++ b/patches/uClibc/0.9.30/110-arm_fix_alignment.patch @@ -0,0 +1,23 @@ +Original patch from Gentoo. + +-= BEGIN original header =- +ARMV5 can use STRD and LDRD access instructions but these accesses need to be +8 byte aligned. The dynamic linker's malloc needs to match this so structures +become 8 byte aligned to void unaligned accesses. + +RP - 14/02/2008 + +-= END original header =- + +diff -durN uClibc-0.9.30.orig/ldso/ldso/arm/dl-sysdep.h uClibc-0.9.30/ldso/ldso/arm/dl-sysdep.h +--- uClibc-0.9.30.orig/ldso/ldso/arm/dl-sysdep.h 2008-09-25 10:35:20.000000000 +0200 ++++ uClibc-0.9.30/ldso/ldso/arm/dl-sysdep.h 2009-02-07 09:57:59.000000000 +0100 +@@ -15,6 +15,8 @@ + GOT_BASE[1] = (unsigned long) MODULE; \ + } + ++#define DL_MALLOC_ALIGN 8 /* EABI needs 8 byte alignment for STRD LDRD*/ ++ + static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p) + { + unsigned long i,t,inc; diff --git a/patches/uClibc/0.9.30/120-rm-whitespace.patch b/patches/uClibc/0.9.30/120-rm-whitespace.patch new file mode 100644 index 0000000..59fe3be --- /dev/null +++ b/patches/uClibc/0.9.30/120-rm-whitespace.patch @@ -0,0 +1,88 @@ +Original patch from Gentoo. + +-= BEGIN original header =- +-= END original header =- + +diff -durN uClibc-0.9.30.orig/include/assert.h uClibc-0.9.30/include/assert.h +--- uClibc-0.9.30.orig/include/assert.h 2008-07-23 13:23:36.000000000 +0200 ++++ uClibc-0.9.30/include/assert.h 2009-02-07 09:57:59.000000000 +0100 +@@ -31,7 +31,7 @@ + #define _ASSERT_H 1 + #include + +-#if defined __cplusplus && __GNUC_PREREQ (2,95) ++#if defined __cplusplus && __GNUC_PREREQ(2,95) + # define __ASSERT_VOID_CAST static_cast + #else + # define __ASSERT_VOID_CAST (void) +@@ -60,12 +60,15 @@ + (__assert (__STRING(expr), __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) + ++/* Define some temporaries to workaround tinyx makedepend bug */ ++#define __GNUC_PREREQ_2_6 __GNUC_PREREQ(2, 6) ++#define __GNUC_PREREQ_2_4 __GNUC_PREREQ(2, 4) + /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' + which contains the name of the function currently being defined. + This is broken in G++ before version 2.6. + C9x has a similar variable called __func__, but prefer the GCC one since + it demangles C++ function names. */ +-# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) ++# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4 + # define __ASSERT_FUNCTION __PRETTY_FUNCTION__ + # else + # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +diff -durN uClibc-0.9.30.orig/include/complex.h uClibc-0.9.30/include/complex.h +--- uClibc-0.9.30.orig/include/complex.h 2008-10-03 16:24:28.000000000 +0200 ++++ uClibc-0.9.30/include/complex.h 2009-02-07 09:57:59.000000000 +0100 +@@ -33,7 +33,7 @@ + /* 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'. */ +-#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97) ++#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97) + # define _Complex __complex__ + #endif + +diff -durN uClibc-0.9.30.orig/include/features.h uClibc-0.9.30/include/features.h +--- uClibc-0.9.30.orig/include/features.h 2008-09-06 18:45:07.000000000 +0200 ++++ uClibc-0.9.30/include/features.h 2009-02-07 09:57:59.000000000 +0100 +@@ -143,7 +143,7 @@ + + /* Convenience macros to test the versions of glibc and gcc. + Use them like this: +- #if __GNUC_PREREQ (2,8) ++ #if __GNUC_PREREQ(2,8) + ... code requiring gcc 2.8 or later ... + #endif + Note - they won't work for gcc1 or glibc1, since the _MINOR macros +@@ -297,7 +297,7 @@ + /* uClibc does not support _FORTIFY_SOURCE */ + #undef _FORTIFY_SOURCE + #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ +- && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 ++ && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 + # if _FORTIFY_SOURCE > 1 + # define __USE_FORTIFY_LEVEL 2 + # else +@@ -366,7 +366,7 @@ + #endif /* !ASSEMBLER */ + + /* Decide whether we can define 'extern inline' functions in headers. */ +-#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \ ++#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \ + && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ \ + && (defined __extern_inline || defined __GNUC_GNU_INLINE__) + # define __USE_EXTERN_INLINES 1 +diff -durN uClibc-0.9.30.orig/include/tgmath.h uClibc-0.9.30/include/tgmath.h +--- uClibc-0.9.30.orig/include/tgmath.h 2008-10-03 16:24:28.000000000 +0200 ++++ uClibc-0.9.30/include/tgmath.h 2009-02-07 09:57:59.000000000 +0100 +@@ -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. */ + +-#if __GNUC_PREREQ (2, 7) ++#if __GNUC_PREREQ(2, 7) + + # ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__ + # define __tgml(fct) fct diff --git a/patches/uClibc/0.9.30/130-arm-ftruncate64.patch b/patches/uClibc/0.9.30/130-arm-ftruncate64.patch new file mode 100644 index 0000000..7bd8ef6 --- /dev/null +++ b/patches/uClibc/0.9.30/130-arm-ftruncate64.patch @@ -0,0 +1,17 @@ +Original patch from Gentoo. + +-= BEGIN original header =- +-= END original header =- + +diff -durN uClibc-0.9.30.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h uClibc-0.9.30/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +--- uClibc-0.9.30.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h 2008-09-25 10:50:56.000000000 +0200 ++++ uClibc-0.9.30/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h 2009-02-07 09:57:59.000000000 +0100 +@@ -39,4 +39,8 @@ + /* define if target supports IEEE signed zero floats */ + #define __UCLIBC_HAVE_SIGNED_ZERO__ + ++#ifdef __ARM_EABI__ ++# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__ ++#endif ++ + #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */ diff --git a/patches/uClibc/0.9.30/140-gnu89-inline.patch b/patches/uClibc/0.9.30/140-gnu89-inline.patch new file mode 100644 index 0000000..02fe3e5 --- /dev/null +++ b/patches/uClibc/0.9.30/140-gnu89-inline.patch @@ -0,0 +1,16 @@ +Original patch from Gentoo. + +-= BEGIN original header =- +-= END original header =- + +diff -durN uClibc-0.9.30.orig/Rules.mak uClibc-0.9.30/Rules.mak +--- uClibc-0.9.30.orig/Rules.mak 2008-11-12 13:24:16.000000000 +0100 ++++ uClibc-0.9.30/Rules.mak 2009-02-07 09:57:59.000000000 +0100 +@@ -502,6 +502,7 @@ + endif + + CFLAGS += $(call check_gcc,-std=gnu99,) ++CFLAGS += $(call check_gcc,-fgnu89-inline,) + + LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -Wl,-shared \ + -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc -- cgit v0.10.2-6-g49f6