jocke@1737: Original patch from Gentoo.
jocke@1737: 
jocke@1737: -= BEGIN original header =-
jocke@1737: -= END original header =-
jocke@1737: 
jocke@1737: diff -durN uClibc-0.9.30.orig/include/assert.h uClibc-0.9.30/include/assert.h
jocke@1737: --- uClibc-0.9.30.orig/include/assert.h	2008-07-23 13:23:36.000000000 +0200
jocke@1737: +++ uClibc-0.9.30/include/assert.h	2009-02-07 09:57:59.000000000 +0100
jocke@1737: @@ -31,7 +31,7 @@
jocke@1737:  #define	_ASSERT_H	1
jocke@1737:  #include <features.h>
jocke@1737:  
jocke@1737: -#if defined __cplusplus && __GNUC_PREREQ (2,95)
jocke@1737: +#if defined __cplusplus && __GNUC_PREREQ(2,95)
jocke@1737:  # define __ASSERT_VOID_CAST static_cast<void>
jocke@1737:  #else
jocke@1737:  # define __ASSERT_VOID_CAST (void)
jocke@1737: @@ -60,12 +60,15 @@
jocke@1737:  		       (__assert (__STRING(expr), __FILE__, __LINE__,    \
jocke@1737:  				       __ASSERT_FUNCTION), 0)))
jocke@1737:  
jocke@1737: +/* Define some temporaries to workaround tinyx makedepend bug */
jocke@1737: +#define	__GNUC_PREREQ_2_6	__GNUC_PREREQ(2, 6)
jocke@1737: +#define	__GNUC_PREREQ_2_4	__GNUC_PREREQ(2, 4)
jocke@1737:  /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
jocke@1737:     which contains the name of the function currently being defined.
jocke@1737:     This is broken in G++ before version 2.6.
jocke@1737:     C9x has a similar variable called __func__, but prefer the GCC one since
jocke@1737:     it demangles C++ function names.  */
jocke@1737: -# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
jocke@1737: +# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4
jocke@1737:  #   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
jocke@1737:  # else
jocke@1737:  #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
jocke@1737: diff -durN uClibc-0.9.30.orig/include/complex.h uClibc-0.9.30/include/complex.h
jocke@1737: --- uClibc-0.9.30.orig/include/complex.h	2008-10-03 16:24:28.000000000 +0200
jocke@1737: +++ uClibc-0.9.30/include/complex.h	2009-02-07 09:57:59.000000000 +0100
jocke@1737: @@ -33,7 +33,7 @@
jocke@1737:  /* We might need to add support for more compilers here.  But since ISO
jocke@1737:     C99 is out hopefully all maintained compilers will soon provide the data
jocke@1737:     types `float complex' and `double complex'.  */
jocke@1737: -#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
jocke@1737: +#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97)
jocke@1737:  # define _Complex __complex__
jocke@1737:  #endif
jocke@1737:  
jocke@1737: diff -durN uClibc-0.9.30.orig/include/features.h uClibc-0.9.30/include/features.h
jocke@1737: --- uClibc-0.9.30.orig/include/features.h	2008-09-06 18:45:07.000000000 +0200
jocke@1737: +++ uClibc-0.9.30/include/features.h	2009-02-07 09:57:59.000000000 +0100
jocke@1737: @@ -143,7 +143,7 @@
jocke@1737:  
jocke@1737:  /* Convenience macros to test the versions of glibc and gcc.
jocke@1737:     Use them like this:
jocke@1737: -   #if __GNUC_PREREQ (2,8)
jocke@1737: +   #if __GNUC_PREREQ(2,8)
jocke@1737:     ... code requiring gcc 2.8 or later ...
jocke@1737:     #endif
jocke@1737:     Note - they won't work for gcc1 or glibc1, since the _MINOR macros
jocke@1737: @@ -297,7 +297,7 @@
jocke@1737:  /* uClibc does not support _FORTIFY_SOURCE */
jocke@1737:  #undef _FORTIFY_SOURCE
jocke@1737:  #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
jocke@1737: -    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
jocke@1737: +    && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
jocke@1737:  # if _FORTIFY_SOURCE > 1
jocke@1737:  #  define __USE_FORTIFY_LEVEL 2
jocke@1737:  # else
jocke@1737: @@ -366,7 +366,7 @@
jocke@1737:   * uclibc itself is usually built without __USE_EXTERN_INLINES,
jocke@1737:   * remove "&& !defined __OPTIMIZE_SIZE__" part to do otherwise.
jocke@1737:   */
jocke@1737: -#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
jocke@1737: +#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \
jocke@1737:      && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ \
jocke@1737:      && (defined __extern_inline || defined __GNUC_GNU_INLINE__)
jocke@1737:  # define __USE_EXTERN_INLINES	1
jocke@1737: diff -durN uClibc-0.9.30.orig/include/tgmath.h uClibc-0.9.30/include/tgmath.h
jocke@1737: --- uClibc-0.9.30.orig/include/tgmath.h	2008-10-03 16:24:28.000000000 +0200
jocke@1737: +++ uClibc-0.9.30/include/tgmath.h	2009-02-07 09:57:59.000000000 +0100
jocke@1737: @@ -34,7 +34,7 @@
jocke@1737:     do not try this for now and instead concentrate only on GNU CC.  Once
jocke@1737:     we have more information support for other compilers might follow.  */
jocke@1737:  
jocke@1737: -#if __GNUC_PREREQ (2, 7)
jocke@1737: +#if __GNUC_PREREQ(2, 7)
jocke@1737:  
jocke@1737:  # ifdef __NO_LONG_DOUBLE_MATH
jocke@1737:  #  define __tgml(fct) fct