summaryrefslogtreecommitdiff
path: root/patches/uClibc/0.9.30.1
diff options
context:
space:
mode:
Diffstat (limited to 'patches/uClibc/0.9.30.1')
-rw-r--r--patches/uClibc/0.9.30.1/100-fix-gethostent_r-failure-retval.patch17
-rw-r--r--patches/uClibc/0.9.30.1/110-arm_fix_alignment.patch23
-rw-r--r--patches/uClibc/0.9.30.1/120-rm-whitespace.patch88
-rw-r--r--patches/uClibc/0.9.30.1/130-arm-ftruncate64.patch17
-rw-r--r--patches/uClibc/0.9.30.1/140-gnu89-inline.patch16
-rw-r--r--patches/uClibc/0.9.30.1/150-64bit-strtouq.patch48
-rw-r--r--patches/uClibc/0.9.30.1/160-c99-ldbl-math.patch474
-rw-r--r--patches/uClibc/0.9.30.1/170-dl-sysdep-inline.patch371
-rw-r--r--patches/uClibc/0.9.30.1/180-getline-conflict.patch30
-rw-r--r--patches/uClibc/0.9.30.1/190-fix-getaddrinfo-NULL-pointer-dereference.patch12
-rw-r--r--patches/uClibc/0.9.30.1/200-pack-netinet-structs.patch224
11 files changed, 0 insertions, 1320 deletions
diff --git a/patches/uClibc/0.9.30.1/100-fix-gethostent_r-failure-retval.patch b/patches/uClibc/0.9.30.1/100-fix-gethostent_r-failure-retval.patch
deleted file mode 100644
index 34e18d2..0000000
--- a/patches/uClibc/0.9.30.1/100-fix-gethostent_r-failure-retval.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.1/110-arm_fix_alignment.patch b/patches/uClibc/0.9.30.1/110-arm_fix_alignment.patch
deleted file mode 100644
index 0d72e7f..0000000
--- a/patches/uClibc/0.9.30.1/110-arm_fix_alignment.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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.1/120-rm-whitespace.patch b/patches/uClibc/0.9.30.1/120-rm-whitespace.patch
deleted file mode 100644
index 59fe3be..0000000
--- a/patches/uClibc/0.9.30.1/120-rm-whitespace.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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 <features.h>
-
--#if defined __cplusplus && __GNUC_PREREQ (2,95)
-+#if defined __cplusplus && __GNUC_PREREQ(2,95)
- # define __ASSERT_VOID_CAST static_cast<void>
- #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.1/130-arm-ftruncate64.patch b/patches/uClibc/0.9.30.1/130-arm-ftruncate64.patch
deleted file mode 100644
index 7bd8ef6..0000000
--- a/patches/uClibc/0.9.30.1/130-arm-ftruncate64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.1/140-gnu89-inline.patch b/patches/uClibc/0.9.30.1/140-gnu89-inline.patch
deleted file mode 100644
index afa9528..0000000
--- a/patches/uClibc/0.9.30.1/140-gnu89-inline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-@@ -519,6 +519,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
diff --git a/patches/uClibc/0.9.30.1/150-64bit-strtouq.patch b/patches/uClibc/0.9.30.1/150-64bit-strtouq.patch
deleted file mode 100644
index bd4ecaa..0000000
--- a/patches/uClibc/0.9.30.1/150-64bit-strtouq.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-[PATCH]: Add strtouq alias (to strtoul) for 64bit
-
-The strtouq alias was only available on 32bit, breaking compilation of stuff
-using strtouq on 64bit machines. At the same time use the correct return
-type (u_quad_t).
-
-Signed-of-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/stdlib.h | 4 +++-
- libc/stdlib/stdlib.c | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: uClibc-0.9.30.1/libc/stdlib/stdlib.c
-===================================================================
---- uClibc-0.9.30.1.orig/libc/stdlib/stdlib.c
-+++ uClibc-0.9.30.1/libc/stdlib/stdlib.c
-@@ -401,6 +401,9 @@
- libc_hidden_proto(__XL_NPP(strtoull))
- strong_alias(__XL_NPP(strtoul),__XL_NPP(strtoull))
- libc_hidden_def(__XL_NPP(strtoull))
-+#if !defined(L_strtoul_l)
-+strong_alias(strtoul,strtouq)
-+#endif
- #endif
-
-
-Index: uClibc-0.9.30.1/include/stdlib.h
-===================================================================
---- uClibc-0.9.30.1.orig/include/stdlib.h
-+++ uClibc-0.9.30.1/include/stdlib.h
-@@ -203,6 +203,8 @@
- __END_NAMESPACE_STD
-
- #ifdef __USE_BSD
-+#include <sys/types.h> /* for u_quad_t */
-+
- /* Convert a string to a quadword integer. */
- __extension__
- extern long long int strtoq (__const char *__restrict __nptr,
-@@ -210,7 +212,7 @@
- __THROW __nonnull ((1)) __wur;
- /* Convert a string to an unsigned quadword integer. */
- __extension__
--extern unsigned long long int strtouq (__const char *__restrict __nptr,
-+extern u_quad_t strtouq (__const char *__restrict __nptr,
- char **__restrict __endptr, int __base)
- __THROW __nonnull ((1)) __wur;
- #endif /* GCC and use BSD. */
diff --git a/patches/uClibc/0.9.30.1/160-c99-ldbl-math.patch b/patches/uClibc/0.9.30.1/160-c99-ldbl-math.patch
deleted file mode 100644
index f44f32c..0000000
--- a/patches/uClibc/0.9.30.1/160-c99-ldbl-math.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-Index: uClibc-0.9.30.1/libm/ldouble_wrappers.c
-===================================================================
---- uClibc-0.9.30.1/libm/ldouble_wrappers.c (revision 25552)
-+++ uClibc-0.9.30.1/libm/ldouble_wrappers.c (working copy)
-@@ -13,6 +13,16 @@
- #include "math.h"
- #include <complex.h>
-
-+#if defined __NO_LONG_DOUBLE_MATH
-+# define int_WRAPPER_C99(func) /* not needed */
-+# else
-+# define int_WRAPPER_C99(func) \
-+int func##l(long double x) \
-+{ \
-+ return func((double) x); \
-+} \
-+libm_hidden_def(func##l)
-+#endif
-
- /* Implement the following, as defined by SuSv3 */
- #if 0
-@@ -543,46 +553,28 @@ long double truncl (long double x)
- #endif
-
-
--#ifdef __DO_C99_MATH__
-+#if defined __DO_C99_MATH__
-
- #ifdef L_fpclassifyl
--int __fpclassifyl (long double x)
--{
-- return __fpclassify ( (double) x );
--}
--libm_hidden_def(__fpclassifyl)
-+int_WRAPPER_C99(__fpclassify)
- #endif
-
- #ifdef L_finitel
--int __finitel (long double x)
--{
-- return __finite ( (double)x );
--}
--libm_hidden_def(__finitel)
-+int_WRAPPER_C99(__finite)
- #endif
-
- #ifdef L_signbitl
--int __signbitl (long double x)
--{
-- return __signbitl ( (double)x );
--}
--libm_hidden_def(__signbitl)
-+int_WRAPPER_C99(__signbit)
- #endif
-
- #ifdef L_isnanl
--int __isnanl (long double x)
--{
-- return __isnan ( (double)x );
--}
--libm_hidden_def(__isnanl)
-+int_WRAPPER_C99(__isnan)
- #endif
-
- #ifdef L_isinfl
--int __isinfl (long double x)
--{
-- return __isinf ( (double)x );
--}
--libm_hidden_def(__isinfl)
-+int_WRAPPER_C99(__isinf)
- #endif
-
--#endif
-+#endif /* DO_C99_MATH */
-+
-+#undef int_WRAPPER_C99
-Index: uClibc-0.9.30.1/libm/nan.c
-===================================================================
---- uClibc-0.9.30.1/libm/nan.c (revision 25552)
-+++ uClibc-0.9.30.1/libm/nan.c (working copy)
-@@ -45,7 +45,7 @@ float nanf (const char *tagp)
- }
- libm_hidden_def(nanf)
-
--#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __NO_LONG_DOUBLE_MATH
- libm_hidden_proto(nanl)
- long double nanl (const char *tagp)
- {
-Index: uClibc-0.9.30.1/include/math.h
-===================================================================
---- uClibc-0.9.30.1/include/math.h (revision 25552)
-+++ uClibc-0.9.30.1/include/math.h (working copy)
-@@ -118,7 +118,7 @@ __BEGIN_DECLS
- # undef __MATH_PRECNAME
-
- # if (__STDC__ - 0 || __GNUC__ - 0) \
-- && (defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ || defined __LDBL_COMPAT)
-+ && (!defined __NO_LONG_DOUBLE_MATH || defined __LDBL_COMPAT)
- # ifdef __LDBL_COMPAT
-
- # ifdef __USE_ISOC99
-@@ -230,7 +230,7 @@ enum
- };
-
- /* Return number of classification appropriate for X. */
--# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifdef __NO_LONG_DOUBLE_MATH
- # define fpclassify(x) \
- (sizeof (x) == sizeof (float) ? __fpclassifyf (x) : __fpclassify (x))
- # else
-@@ -242,7 +242,7 @@ enum
- # endif
-
- /* Return nonzero value if sign of X is negative. */
--# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifdef __NO_LONG_DOUBLE_MATH
- # define signbit(x) \
- (sizeof (x) == sizeof (float) ? __signbitf (x) : __signbit (x))
- # else
-@@ -254,7 +254,7 @@ enum
- # endif
-
- /* Return nonzero value if X is not +-Inf or NaN. */
--# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifdef __NO_LONG_DOUBLE_MATH
- # define isfinite(x) \
- (sizeof (x) == sizeof (float) ? __finitef (x) : __finite (x))
- # else
-@@ -270,7 +270,7 @@ enum
-
- /* Return nonzero value if X is a NaN. We could use `fpclassify' but
- we already have this functions `__isnan' and it is faster. */
--# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifdef __NO_LONG_DOUBLE_MATH
- # define isnan(x) \
- (sizeof (x) == sizeof (float) ? __isnanf (x) : __isnan (x))
- # else
-@@ -282,7 +282,7 @@ enum
- # endif
-
- /* Return nonzero value is X is positive or negative infinity. */
--# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifdef __NO_LONG_DOUBLE_MATH
- # define isinf(x) \
- (sizeof (x) == sizeof (float) ? __isinff (x) : __isinf (x))
- # else
-Index: uClibc-0.9.30.1/include/tgmath.h
-===================================================================
---- uClibc-0.9.30.1/include/tgmath.h (revision 25552)
-+++ uClibc-0.9.30.1/include/tgmath.h (working copy)
-@@ -36,7 +36,7 @@
-
- #if __GNUC_PREREQ(2, 7)
-
--# ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifdef __NO_LONG_DOUBLE_MATH
- # define __tgml(fct) fct
- # else
- # define __tgml(fct) fct ## l
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/wordsize.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/wordsize.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/wordsize.h (working copy)
-@@ -7,13 +7,13 @@
- # define __WORDSIZE 32
- #endif
-
--#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __LONG_DOUBLE_MATH_OPTIONAL
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
-
- /* Signal the glibc ABI didn't used to have a `long double'.
- The changes all the `long double' function variants to be redirects
- to the double functions. */
- # define __LONG_DOUBLE_MATH_OPTIONAL 1
- # ifndef __LONG_DOUBLE_128__
--# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- # endif
- #endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/mathdef.h (working copy)
-@@ -65,11 +65,13 @@ typedef double double_t;
-
- #endif /* ISO C99 */
-
--#ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+#ifndef __NO_LONG_DOUBLE_MATH
- #include <bits/wordsize.h>
- /* Signal that we do not really have a `long double'. The disables the
- declaration of all the `long double' function variants. */
- # if __WORDSIZE == 32
--# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+# elif !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- # endif /* __WORDSIZE == 32 */
--#endif /* __UCLIBC_HAS_LONG_DOUBLE_MATH__ */
-+#endif /* __NO_LONG_DOUBLE_MATH */
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/mathdef.h (working copy)
-@@ -34,3 +34,11 @@ typedef double double_t; /* `double' exp
- # define FP_ILOGBNAN (2147483647)
-
- #endif /* ISO C99 */
-+
-+#ifndef __NO_LONG_DOUBLE_MATH
-+/* Signal that we do not really have a `long double'. This disables the
-+ declaration of all the `long double' function variants. */
-+/* XXX The FPA does support this but the patterns in GCC are currently
-+ turned off. */
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/mathdef.h (working copy)
-@@ -36,3 +36,7 @@ typedef long double double_t; /* `double
- # define FP_ILOGBNAN (2147483647)
-
- #endif /* ISO C99 */
-+
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/wordsize.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/wordsize.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/wordsize.h (working copy)
-@@ -18,13 +18,13 @@
-
- #define __WORDSIZE 64
-
--#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __LONG_DOUBLE_MATH_OPTIONAL
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL
-
- /* Signal that we didn't used to have a `long double'. The changes all
- the `long double' function variants to be redirects to the double
- functions. */
- # define __LONG_DOUBLE_MATH_OPTIONAL 1
- # ifndef __LONG_DOUBLE_128__
--# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- # endif
- #endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/mathdef.h (working copy)
-@@ -78,3 +78,7 @@ typedef double double_t;
-
- # endif /* GNUC before 3.4 */
- #endif /* COMPLEX_H */
-+
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/common/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/common/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/common/bits/mathdef.h (working copy)
-@@ -35,3 +35,9 @@ typedef double double_t; /* `double' exp
- # define FP_ILOGBNAN 2147483647
-
- #endif /* ISO C99 */
-+
-+#ifndef __NO_LONG_DOUBLE_MATH
-+/* Signal that we do not really have a `long double'. The disables the
-+ declaration of all the `long double' function variants. */
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/mathdef.h (working copy)
-@@ -44,3 +44,7 @@ typedef long double double_t; /* `double
- # define FP_ILOGBNAN (-2147483647 - 1)
-
- #endif /* ISO C99 */
-+
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/nios2/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/nios2/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/nios2/bits/mathdef.h (working copy)
-@@ -34,3 +34,11 @@ typedef double double_t; /* `double' exp
- # define FP_ILOGBNAN (2147483647)
-
- #endif /* ISO C99 */
-+
-+#ifndef __NO_LONG_DOUBLE_MATH
-+/* Signal that we do not really have a `long double'. This disables the
-+ declaration of all the `long double' function variants. */
-+/* XXX The FPA does support this but the patterns in GCC are currently
-+ turned off. */
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/mathdef.h (working copy)
-@@ -46,3 +46,7 @@ typedef long double double_t; /* `double
- # define FP_ILOGBNAN (-2147483647 - 1)
-
- #endif /* ISO C99 */
-+
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/mathdef.h (working copy)
-@@ -36,8 +36,8 @@ typedef double double_t; /* `double' exp
-
- #endif /* ISO C99 */
-
--#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+#ifndef __NO_LONG_DOUBLE_MATH
- /* Signal that we do not really have a `long double'. The disables the
- declaration of all the `long double' function variants. */
--# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- #endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/mathdef.h (working copy)
-@@ -35,3 +35,7 @@ typedef double double_t; /* `double' exp
- # define FP_ILOGBNAN 2147483647
-
- #endif /* ISO C99 */
-+
-+#if !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/mathdef.h (working copy)
-@@ -39,8 +39,10 @@ typedef double double_t; /* `double' exp
-
- #endif /* ISO C99 */
-
--#if defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && _MIPS_SIM == _ABIO32
-+#if ! defined __NO_LONG_DOUBLE_MATH && _MIPS_SIM == _ABIO32
- /* Signal that we do not really have a `long double'. This disables the
- declaration of all the `long double' function variants. */
--# error defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ and _MIPS_SIM == _ABIO32
-+# define __NO_LONG_DOUBLE_MATH 1
-+#elif !defined __NO_LONG_DOUBLE_MATH && !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- #endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/nios/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/nios/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/nios/bits/mathdef.h (working copy)
-@@ -34,3 +34,11 @@ typedef double double_t; /* `double' exp
- # define FP_ILOGBNAN (2147483647)
-
- #endif /* ISO C99 */
-+
-+#ifndef __NO_LONG_DOUBLE_MATH
-+/* Signal that we do not really have a `long double'. This disables the
-+ declaration of all the `long double' function variants. */
-+/* XXX The FPA does support this but the patterns in GCC are currently
-+ turned off. */
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/wordsize.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/wordsize.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/wordsize.h (working copy)
-@@ -6,7 +6,7 @@
- # define __WORDSIZE 32
- #endif
-
--#if 0 /* uClibc: done in mathdefs.h: defined __UCLIBC_HAS_LONG_DOUBLE_MATH__ && !defined __LONG_DOUBLE_MATH_OPTIONAL*/
-+#if 0 /* uClibc: done in mathdefs.h: !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL*/
-
- # if __WORDSIZE == 32
- /* Signal that in 32bit ABI we didn't used to have a `long double'.
-@@ -14,7 +14,7 @@
- to the double functions. */
- # define __LONG_DOUBLE_MATH_OPTIONAL 1
- # ifndef __LONG_DOUBLE_128__
--# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- # endif
- # endif
- #endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathdef.h (working copy)
-@@ -57,13 +57,15 @@ typedef double double_t;
-
- #endif /* ISO C99 */
-
--#ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+#ifndef __NO_LONG_DOUBLE_MATH
-
- # if __WORDSIZE == 32
- /* Signal that in 32bit ABI we do not really have a `long double'.
- The disables the declaration of all the `long double' function
- variants. */
--# undef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
-+# elif !defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# define __NO_LONG_DOUBLE_MATH 1
- # endif
-
- #endif
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathinline.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathinline.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/mathinline.h (working copy)
-@@ -37,7 +37,7 @@
-
- # if __WORDSIZE == 32
-
--# ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifndef __NO_LONG_DOUBLE_MATH
-
- # define __unordered_cmp(x, y) \
- (__extension__ \
-@@ -157,7 +157,7 @@ __NTH (__signbit (double __x))
- return __u.__i[0] < 0;
- }
-
--# ifdef __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# ifndef __NO_LONG_DOUBLE_MATH
- __MATH_INLINE int
- __NTH (__signbitl (long double __x))
- {
-@@ -219,7 +219,7 @@ __NTH (sqrtl (long double __x))
- _Qp_sqrt (&__r, &__x);
- return __r;
- }
--# elif defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# elif !defined __NO_LONG_DOUBLE_MATH
- __MATH_INLINE long double
- sqrtl (long double __x) __THROW
- {
-@@ -257,7 +257,7 @@ __ieee754_sqrtl (long double __x)
- _Qp_sqrt(&__r, &__x);
- return __r;
- }
--# elif defined __UCLIBC_HAS_LONG_DOUBLE_MATH__
-+# elif !defined __NO_LONG_DOUBLE_MATH
- __MATH_INLINE long double
- __ieee754_sqrtl (long double __x)
- {
-Index: uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/mathdef.h
-===================================================================
---- uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/mathdef.h (revision 25552)
-+++ uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/mathdef.h (working copy)
-@@ -61,3 +61,9 @@ typedef double double_t;
- # define FP_ILOGBNAN 0x7fffffff
-
- #endif /* ISO C99 */
-+
-+#ifndef __NO_LONG_DOUBLE_MATH
-+/* Signal that we do not really have a `long double'. The disables the
-+ declaration of all the `long double' function variants. */
-+# define __NO_LONG_DOUBLE_MATH 1
-+#endif
diff --git a/patches/uClibc/0.9.30.1/170-dl-sysdep-inline.patch b/patches/uClibc/0.9.30.1/170-dl-sysdep-inline.patch
deleted file mode 100644
index 460d66a..0000000
--- a/patches/uClibc/0.9.30.1/170-dl-sysdep-inline.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-Index: uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/arm/dl-sysdep.h (working copy)
-@@ -17,7 +17,7 @@
-
- #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)
-+static __always_inline unsigned long arm_modulus(unsigned long m, unsigned long p)
- {
- unsigned long i,t,inc;
- i=p; t=0;
-@@ -74,7 +74,7 @@ unsigned long _dl_linux_resolver(struct
- first element of the GOT. We used to use the PIC register to do this
- without a constant pool reference, but GCC 4.2 will use a pseudo-register
- for the PIC base, so it may not be in r10. */
--static __inline__ Elf32_Addr __attribute__ ((unused))
-+static __always_inline Elf32_Addr __attribute__ ((unused))
- elf_machine_dynamic (void)
- {
- Elf32_Addr dynamic;
-@@ -106,7 +106,7 @@ elf_machine_dynamic (void)
- }
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr __attribute__ ((unused))
-+static __always_inline Elf32_Addr __attribute__ ((unused))
- elf_machine_load_address (void)
- {
- extern void __dl_start __asm__ ("_dl_start");
-@@ -130,7 +130,7 @@ elf_machine_load_address (void)
- return pcrel_addr - got_addr;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/powerpc/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/powerpc/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/powerpc/dl-sysdep.h (working copy)
-@@ -90,7 +90,7 @@ void _dl_init_got(unsigned long *lpnt,st
- #define ELF_MACHINE_PLTREL_OVERLAP 1
-
- /* Return the value of the GOT pointer. */
--static __inline__ Elf32_Addr * __attribute__ ((const))
-+static __always_inline Elf32_Addr * __attribute__ ((const))
- ppc_got (void)
- {
- Elf32_Addr *got;
-@@ -109,14 +109,14 @@ ppc_got (void)
-
- /* Return the link-time address of _DYNAMIC, stored as
- the first value in the GOT. */
--static __inline__ Elf32_Addr __attribute__ ((const))
-+static __always_inline Elf32_Addr __attribute__ ((const))
- elf_machine_dynamic (void)
- {
- return *ppc_got();
- }
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr __attribute__ ((const))
-+static __always_inline Elf32_Addr __attribute__ ((const))
- elf_machine_load_address (void)
- {
- Elf32_Addr *branchaddr;
-@@ -164,7 +164,7 @@ elf_machine_load_address (void)
- return runtime_dynamic - elf_machine_dynamic ();
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/sh64/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/sh64/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/sh64/dl-sysdep.h (working copy)
-@@ -42,7 +42,7 @@ extern unsigned long _dl_linux_resolver(
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. */
--static __inline__ Elf32_Addr elf_machine_dynamic(void)
-+static __always_inline Elf32_Addr elf_machine_dynamic(void)
- {
- register Elf32_Addr *got;
-
-@@ -70,7 +70,7 @@ static __inline__ Elf32_Addr elf_machine
- }
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr elf_machine_load_address(void)
-+static __always_inline Elf32_Addr elf_machine_load_address(void)
- {
- Elf32_Addr addr;
-
-@@ -123,7 +123,7 @@ static __inline__ Elf32_Addr elf_machine
- } \
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/m68k/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/m68k/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/m68k/dl-sysdep.h (working copy)
-@@ -41,7 +41,7 @@ extern unsigned long _dl_linux_resolver
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. */
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_dynamic (void)
- {
- register Elf32_Addr *got __asm__ ("%a5");
-@@ -50,7 +50,7 @@ elf_machine_dynamic (void)
-
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_load_address (void)
- {
- Elf32_Addr addr;
-@@ -60,7 +60,7 @@ elf_machine_load_address (void)
- return addr;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/i386/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/i386/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/i386/dl-sysdep.h (working copy)
-@@ -42,8 +42,8 @@ extern unsigned long _dl_linux_resolver(
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. */
--static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused;
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr elf_machine_dynamic (void) attribute_unused;
-+static __always_inline Elf32_Addr
- elf_machine_dynamic (void)
- {
- register Elf32_Addr *got __asm__ ("%ebx");
-@@ -52,8 +52,8 @@ elf_machine_dynamic (void)
-
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr elf_machine_load_address (void) attribute_unused;
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr elf_machine_load_address (void) attribute_unused;
-+static __always_inline Elf32_Addr
- elf_machine_load_address (void)
- {
- /* It doesn't matter what variable this is, the reference never makes
-@@ -66,7 +66,7 @@ elf_machine_load_address (void)
- return addr;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/cris/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/cris/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/cris/dl-sysdep.h (working copy)
-@@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver(
- || ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \
- | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY))
-
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_dynamic(void)
- {
- /* Don't just set this to an asm variable "r0" since that's not logical
-@@ -61,7 +61,7 @@ elf_machine_dynamic(void)
- there's some other symbol we could use, that we don't *have* to force a
- GOT entry for. */
-
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_load_address(void)
- {
- Elf32_Addr gotaddr_diff;
-@@ -95,7 +95,7 @@ elf_machine_load_address(void)
- return gotaddr_diff;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/xtensa/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/xtensa/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/xtensa/dl-sysdep.h (working copy)
-@@ -87,7 +87,7 @@ extern unsigned long _dl_linux_resolver
- (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
-
- /* Return the link-time address of _DYNAMIC. */
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_dynamic (void)
- {
- /* This function is only used while bootstrapping the runtime linker.
-@@ -97,7 +97,7 @@ elf_machine_dynamic (void)
- }
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_load_address (void)
- {
- Elf32_Addr addr, tmp;
-@@ -118,7 +118,7 @@ elf_machine_load_address (void)
- return addr - 3;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/sparc/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/sparc/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/sparc/dl-sysdep.h (working copy)
-@@ -49,7 +49,7 @@ unsigned long _dl_linux_resolver(struct
-
- #ifndef COMPILE_ASM
- /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */
--static __inline__ unsigned long
-+static __always_inline unsigned long
- sparc_mod(unsigned long m, unsigned long p)
- {
- unsigned long i, t, inc;
-@@ -127,7 +127,7 @@ do { register Elf32_Addr pc __asm__("
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. */
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_dynamic (void)
- {
- register Elf32_Addr *got __asm__ ("%l7");
-@@ -138,7 +138,7 @@ elf_machine_dynamic (void)
- }
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr
-+static __always_inline Elf32_Addr
- elf_machine_load_address (void)
- {
- register Elf32_Addr *pc __asm__ ("%o7"), *got __asm__ ("%l7");
-@@ -157,7 +157,7 @@ elf_machine_load_address (void)
- return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h (working copy)
-@@ -163,7 +163,7 @@ void _dl_perform_mips_global_got_relocat
-
- #define OFFSET_GP_GOT 0x7ff0
-
--static __inline__ ElfW(Addr) *
-+static __always_inline ElfW(Addr) *
- elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
- {
- /* FIXME: the offset of gp from GOT may be system-dependent. */
-@@ -173,7 +173,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpre
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. We assume its $gp points to the primary GOT. */
--static __inline__ ElfW(Addr)
-+static __always_inline ElfW(Addr)
- elf_machine_dynamic (void)
- {
- register ElfW(Addr) gp __asm__ ("$28");
-@@ -192,7 +192,7 @@ elf_machine_dynamic (void)
- #endif
-
- /* Return the run-time load address of the shared object. */
--static __inline__ ElfW(Addr)
-+static __always_inline ElfW(Addr)
- elf_machine_load_address (void)
- {
- ElfW(Addr) addr;
-@@ -208,7 +208,7 @@ elf_machine_load_address (void)
- return addr;
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr,
- ElfW(Word) relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/sh/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/sh/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/sh/dl-sysdep.h (working copy)
-@@ -25,7 +25,7 @@
- struct elf_resolve;
- extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
-
--static __inline__ unsigned int
-+static __always_inline unsigned int
- _dl_urem(unsigned int n, unsigned int base)
- {
- int res;
-@@ -100,7 +100,7 @@ _dl_urem(unsigned int n, unsigned int ba
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. */
--static __inline__ Elf32_Addr __attribute__ ((unused))
-+static __always_inline Elf32_Addr __attribute__ ((unused))
- elf_machine_dynamic (void)
- {
- register Elf32_Addr *got;
-@@ -109,7 +109,7 @@ elf_machine_dynamic (void)
- }
-
- /* Return the run-time load address of the shared object. */
--static __inline__ Elf32_Addr __attribute__ ((unused))
-+static __always_inline Elf32_Addr __attribute__ ((unused))
- elf_machine_load_address (void)
- {
- Elf32_Addr addr;
-@@ -151,7 +151,7 @@ elf_machine_load_address (void)
- } \
- }
-
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
-Index: uClibc-0.9.30.1/ldso/ldso/bfin/dl-sysdep.h
-===================================================================
---- uClibc-0.9.30.1/ldso/ldso/bfin/dl-sysdep.h (revision 25503)
-+++ uClibc-0.9.30.1/ldso/ldso/bfin/dl-sysdep.h (working copy)
-@@ -213,7 +213,7 @@ while (0)
- #endif
-
- #include <elf.h>
--static __inline__ void
-+static __always_inline void
- elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr,
- Elf32_Word relative_count)
- {
diff --git a/patches/uClibc/0.9.30.1/180-getline-conflict.patch b/patches/uClibc/0.9.30.1/180-getline-conflict.patch
deleted file mode 100644
index 50842f9..0000000
--- a/patches/uClibc/0.9.30.1/180-getline-conflict.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/extra/scripts/unifdef.c
-+++ b/extra/scripts/unifdef.c
-@@ -206,7 +206,7 @@
- static void error(const char *);
- static int findsym(const char *);
- static void flushline(bool);
--static Linetype getline(void);
-+static Linetype get_line(void);
- static Linetype ifeval(const char **);
- static void ignoreoff(void);
- static void ignoreon(void);
-@@ -512,7 +512,7 @@
-
- for (;;) {
- linenum++;
-- lineval = getline();
-+ lineval = get_line();
- trans_table[ifstate[depth]][lineval]();
- debug("process %s -> %s depth %d",
- linetype_name[lineval],
-@@ -526,7 +526,7 @@
- * help from skipcomment().
- */
- static Linetype
--getline(void)
-+get_line(void)
- {
- const char *cp;
- int cursym;
-
diff --git a/patches/uClibc/0.9.30.1/190-fix-getaddrinfo-NULL-pointer-dereference.patch b/patches/uClibc/0.9.30.1/190-fix-getaddrinfo-NULL-pointer-dereference.patch
deleted file mode 100644
index 3909871..0000000
--- a/patches/uClibc/0.9.30.1/190-fix-getaddrinfo-NULL-pointer-dereference.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Narup uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c uClibc-0.9.30.1/libc/inet/getaddrinfo.c
---- uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c 2009-02-26 21:49:14.000000000 +0900
-+++ uClibc-0.9.30.1/libc/inet/getaddrinfo.c 2009-03-06 00:59:23.000000000 +0900
-@@ -187,6 +187,8 @@ static unsigned __check_pf(void)
- }
-
- for (runp = ifa; runp != NULL; runp = runp->ifa_next) {
-+ if (runp->ifa_addr == NULL)
-+ continue;
- #if defined __UCLIBC_HAS_IPV4__
- if (runp->ifa_addr->sa_family == PF_INET)
- seen |= SEEN_IPV4;
diff --git a/patches/uClibc/0.9.30.1/200-pack-netinet-structs.patch b/patches/uClibc/0.9.30.1/200-pack-netinet-structs.patch
deleted file mode 100644
index d727f4d..0000000
--- a/patches/uClibc/0.9.30.1/200-pack-netinet-structs.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff -urN uClibc-0.9.30.1.orig/include/netinet/igmp.h uClibc-0.9.30.1/include/netinet/igmp.h
---- uClibc-0.9.30.1.orig/include/netinet/igmp.h 2009-04-08 09:00:10.926545132 +0200
-+++ uClibc-0.9.30.1/include/netinet/igmp.h 2009-04-08 09:00:26.242514273 +0200
-@@ -69,7 +69,7 @@
- u_int8_t igmp_code; /* routing code */
- u_int16_t igmp_cksum; /* checksum */
- struct in_addr igmp_group; /* group address */
--};
-+} __attribute__ ((__packed__));
-
- #define IGMP_MINLEN 8
-
-diff -urN uClibc-0.9.30.1.orig/include/netinet/in.h uClibc-0.9.30.1/include/netinet/in.h
---- uClibc-0.9.30.1.orig/include/netinet/in.h 2009-04-08 09:00:10.926545132 +0200
-+++ uClibc-0.9.30.1/include/netinet/in.h 2009-04-08 09:00:26.242514273 +0200
-@@ -202,7 +202,7 @@
- #define s6_addr in6_u.u6_addr8
- #define s6_addr16 in6_u.u6_addr16
- #define s6_addr32 in6_u.u6_addr32
-- };
-+ } __attribute__ ((__packed__));
-
- extern const struct in6_addr in6addr_any; /* :: */
- extern const struct in6_addr in6addr_loopback; /* ::1 */
-@@ -229,7 +229,7 @@
- __SOCKADDR_COMMON_SIZE -
- sizeof (in_port_t) -
- sizeof (struct in_addr)];
-- };
-+ } __attribute__ ((__packed__));
- #endif
-
- /* Ditto, for IPv6. */
-@@ -240,7 +240,7 @@
- uint32_t sin6_flowinfo; /* IPv6 flow information */
- struct in6_addr sin6_addr; /* IPv6 address */
- uint32_t sin6_scope_id; /* IPv6 scope-id */
-- };
-+ } __attribute__ ((__packed__));
-
-
- /* IPv4 multicast request. */
-@@ -251,7 +251,7 @@
-
- /* Local IP address of interface. */
- struct in_addr imr_interface;
-- };
-+ } __attribute__ ((__packed__));
-
- struct ip_mreq_source
- {
-@@ -263,7 +263,7 @@
-
- /* IP address of interface. */
- struct in_addr imr_sourceaddr;
-- };
-+ } __attribute__ ((__packed__));
-
- /* Likewise, for IPv6. */
- struct ipv6_mreq
-@@ -273,7 +273,7 @@
-
- /* local interface */
- unsigned int ipv6mr_interface;
-- };
-+ } __attribute__ ((__packed__));
-
-
- /* Multicast group request. */
-@@ -284,7 +284,7 @@
-
- /* Group address. */
- struct sockaddr_storage gr_group;
-- };
-+ } __attribute__ ((__packed__));
-
- struct group_source_req
- {
-@@ -296,7 +296,7 @@
-
- /* Source address. */
- struct sockaddr_storage gsr_source;
-- };
-+ } __attribute__ ((__packed__));
-
-
- /* Full-state filter operations. */
-@@ -315,7 +315,7 @@
- uint32_t imsf_numsrc;
- /* Source addresses. */
- struct in_addr imsf_slist[1];
-- };
-+ } __attribute__ ((__packed__));
-
- #define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \
- - sizeof (struct in_addr) \
-@@ -336,7 +336,7 @@
- uint32_t gf_numsrc;
- /* Source addresses. */
- struct sockaddr_storage gf_slist[1];
--};
-+} __attribute__ ((__packed__));
-
- #define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \
- - sizeof (struct sockaddr_storage) \
-@@ -460,14 +460,14 @@
- {
- struct in6_addr ipi6_addr; /* src/dst IPv6 address */
- unsigned int ipi6_ifindex; /* send/recv interface index */
-- };
-+ } __attribute__ ((__packed__));
-
- /* IPv6 MTU information. */
- struct ip6_mtuinfo
- {
- struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */
- uint32_t ip6m_mtu; /* path MTU in host byte order */
-- };
-+ } __attribute__ ((__packed__));
-
-
- #if 0 /*def __USE_GNU*/
-diff -urN uClibc-0.9.30.1.orig/include/netinet/ip.h uClibc-0.9.30.1/include/netinet/ip.h
---- uClibc-0.9.30.1.orig/include/netinet/ip.h 2009-04-08 09:00:10.926545132 +0200
-+++ uClibc-0.9.30.1/include/netinet/ip.h 2009-04-08 09:00:26.242514273 +0200
-@@ -63,7 +63,7 @@
- u_int32_t saddr;
- u_int32_t daddr;
- /*The options start here. */
-- };
-+ } __attribute__ ((__packed__));
-
- #ifdef __USE_BSD
- /*
-@@ -127,7 +127,7 @@
- u_int8_t ip_p; /* protocol */
- u_short ip_sum; /* checksum */
- struct in_addr ip_src, ip_dst; /* source and dest address */
-- };
-+ } __attribute__ ((__packed__));
-
- /*
- * Time stamp option structure.
-diff -urN uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h uClibc-0.9.30.1/include/netinet/ip_icmp.h
---- uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h 2009-04-08 09:00:10.926545132 +0200
-+++ uClibc-0.9.30.1/include/netinet/ip_icmp.h 2009-04-08 09:00:26.242514273 +0200
-@@ -43,7 +43,7 @@
- u_int16_t mtu;
- } frag; /* path mtu discovery */
- } un;
--};
-+} __attribute__ ((__packed__));
-
- #define ICMP_ECHOREPLY 0 /* Echo Reply */
- #define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
-@@ -199,7 +199,7 @@
- #define icmp_radv icmp_dun.id_radv
- #define icmp_mask icmp_dun.id_mask
- #define icmp_data icmp_dun.id_data
--};
-+} __attribute__ ((__packed__));
-
- /*
- * Lower bounds on packet lengths for various types.
-diff -urN uClibc-0.9.30.1.orig/include/netinet/tcp.h uClibc-0.9.30.1/include/netinet/tcp.h
---- uClibc-0.9.30.1.orig/include/netinet/tcp.h 2009-04-08 09:00:10.926545132 +0200
-+++ uClibc-0.9.30.1/include/netinet/tcp.h 2009-04-08 09:00:26.242514273 +0200
-@@ -86,7 +86,7 @@
- u_int16_t th_win; /* window */
- u_int16_t th_sum; /* checksum */
- u_int16_t th_urp; /* urgent pointer */
--};
-+} __attribute__ ((__packed__));
-
- # else /* !__FAVOR_BSD */
- struct tcphdr
-@@ -121,7 +121,7 @@
- u_int16_t window;
- u_int16_t check;
- u_int16_t urg_ptr;
--};
-+} __attribute__ ((__packed__));
- # endif /* __FAVOR_BSD */
-
- enum
-@@ -226,7 +226,7 @@
- u_int32_t tcpi_rcv_space;
-
- u_int32_t tcpi_total_retrans;
--};
-+} __attribute__ ((__packed__));
-
-
- /* For TCP_MD5SIG socket option. */
-@@ -239,7 +239,7 @@
- u_int16_t tcpm_keylen; /* Key length. */
- u_int32_t __tcpm_pad2; /* Zero. */
- u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
--};
-+} __attribute__ ((__packed__));
-
- #endif /* Misc. */
-
-diff -urN uClibc-0.9.30.1.orig/include/netinet/udp.h uClibc-0.9.30.1/include/netinet/udp.h
---- uClibc-0.9.30.1.orig/include/netinet/udp.h 2009-04-08 09:00:10.926545132 +0200
-+++ uClibc-0.9.30.1/include/netinet/udp.h 2009-04-08 09:00:26.242514273 +0200
-@@ -61,7 +61,7 @@
- u_int16_t uh_dport; /* destination port */
- u_int16_t uh_ulen; /* udp length */
- u_int16_t uh_sum; /* udp checksum */
--};
-+} __attribute__ ((__packed__));
-
- #else
-
-@@ -71,7 +71,7 @@
- u_int16_t dest;
- u_int16_t len;
- u_int16_t check;
--};
-+} __attribute__ ((__packed__));
- #endif
-
- #define SOL_UDP 17 /* sockopt level for UDP */