1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/uClibc/0.9.30.1/120-rm-whitespace.patch	Sun Mar 08 17:11:31 2009 +0000
     1.3 @@ -0,0 +1,88 @@
     1.4 +Original patch from Gentoo.
     1.5 +
     1.6 +-= BEGIN original header =-
     1.7 +-= END original header =-
     1.8 +
     1.9 +diff -durN uClibc-0.9.30.orig/include/assert.h uClibc-0.9.30/include/assert.h
    1.10 +--- uClibc-0.9.30.orig/include/assert.h	2008-07-23 13:23:36.000000000 +0200
    1.11 ++++ uClibc-0.9.30/include/assert.h	2009-02-07 09:57:59.000000000 +0100
    1.12 +@@ -31,7 +31,7 @@
    1.13 + #define	_ASSERT_H	1
    1.14 + #include <features.h>
    1.15 + 
    1.16 +-#if defined __cplusplus && __GNUC_PREREQ (2,95)
    1.17 ++#if defined __cplusplus && __GNUC_PREREQ(2,95)
    1.18 + # define __ASSERT_VOID_CAST static_cast<void>
    1.19 + #else
    1.20 + # define __ASSERT_VOID_CAST (void)
    1.21 +@@ -60,12 +60,15 @@
    1.22 + 		       (__assert (__STRING(expr), __FILE__, __LINE__,    \
    1.23 + 				       __ASSERT_FUNCTION), 0)))
    1.24 + 
    1.25 ++/* Define some temporaries to workaround tinyx makedepend bug */
    1.26 ++#define	__GNUC_PREREQ_2_6	__GNUC_PREREQ(2, 6)
    1.27 ++#define	__GNUC_PREREQ_2_4	__GNUC_PREREQ(2, 4)
    1.28 + /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
    1.29 +    which contains the name of the function currently being defined.
    1.30 +    This is broken in G++ before version 2.6.
    1.31 +    C9x has a similar variable called __func__, but prefer the GCC one since
    1.32 +    it demangles C++ function names.  */
    1.33 +-# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
    1.34 ++# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4
    1.35 + #   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
    1.36 + # else
    1.37 + #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
    1.38 +diff -durN uClibc-0.9.30.orig/include/complex.h uClibc-0.9.30/include/complex.h
    1.39 +--- uClibc-0.9.30.orig/include/complex.h	2008-10-03 16:24:28.000000000 +0200
    1.40 ++++ uClibc-0.9.30/include/complex.h	2009-02-07 09:57:59.000000000 +0100
    1.41 +@@ -33,7 +33,7 @@
    1.42 + /* We might need to add support for more compilers here.  But since ISO
    1.43 +    C99 is out hopefully all maintained compilers will soon provide the data
    1.44 +    types `float complex' and `double complex'.  */
    1.45 +-#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
    1.46 ++#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97)
    1.47 + # define _Complex __complex__
    1.48 + #endif
    1.49 + 
    1.50 +diff -durN uClibc-0.9.30.orig/include/features.h uClibc-0.9.30/include/features.h
    1.51 +--- uClibc-0.9.30.orig/include/features.h	2008-09-06 18:45:07.000000000 +0200
    1.52 ++++ uClibc-0.9.30/include/features.h	2009-02-07 09:57:59.000000000 +0100
    1.53 +@@ -143,7 +143,7 @@
    1.54 + 
    1.55 + /* Convenience macros to test the versions of glibc and gcc.
    1.56 +    Use them like this:
    1.57 +-   #if __GNUC_PREREQ (2,8)
    1.58 ++   #if __GNUC_PREREQ(2,8)
    1.59 +    ... code requiring gcc 2.8 or later ...
    1.60 +    #endif
    1.61 +    Note - they won't work for gcc1 or glibc1, since the _MINOR macros
    1.62 +@@ -297,7 +297,7 @@
    1.63 + /* uClibc does not support _FORTIFY_SOURCE */
    1.64 + #undef _FORTIFY_SOURCE
    1.65 + #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
    1.66 +-    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
    1.67 ++    && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
    1.68 + # if _FORTIFY_SOURCE > 1
    1.69 + #  define __USE_FORTIFY_LEVEL 2
    1.70 + # else
    1.71 +@@ -366,7 +366,7 @@
    1.72 + #endif	/* !ASSEMBLER */
    1.73 + 
    1.74 + /* Decide whether we can define 'extern inline' functions in headers.  */
    1.75 +-#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
    1.76 ++#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \
    1.77 +     && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ \
    1.78 +     && (defined __extern_inline || defined __GNUC_GNU_INLINE__)
    1.79 + # define __USE_EXTERN_INLINES	1
    1.80 +diff -durN uClibc-0.9.30.orig/include/tgmath.h uClibc-0.9.30/include/tgmath.h
    1.81 +--- uClibc-0.9.30.orig/include/tgmath.h	2008-10-03 16:24:28.000000000 +0200
    1.82 ++++ uClibc-0.9.30/include/tgmath.h	2009-02-07 09:57:59.000000000 +0100
    1.83 +@@ -34,7 +34,7 @@
    1.84 +    do not try this for now and instead concentrate only on GNU CC.  Once
    1.85 +    we have more information support for other compilers might follow.  */
    1.86 + 
    1.87 +-#if __GNUC_PREREQ (2, 7)
    1.88 ++#if __GNUC_PREREQ(2, 7)
    1.89 + 
    1.90 + # ifndef __UCLIBC_HAS_LONG_DOUBLE_MATH__
    1.91 + #  define __tgml(fct) fct