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