git.libre-soc.org Git - buildroot.git/blob

   1 diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h
   2 --- uClibc-0.9.29-0rig/include/assert.h 2005-11-03 23:42:46.000000000 +0100
   3 +++ uClibc-0.9.29/include/assert.h      2007-08-13 19:10:57.000000000 +0200
   4 @@ -31,7 +31,7 @@
   5  #define        _ASSERT_H       1
   6  #include <features.h>
   7
   8 -#if defined __cplusplus && __GNUC_PREREQ (2,95)
   9 +#if defined __cplusplus && __GNUC_PREREQ(2,95)
  10  # define __ASSERT_VOID_CAST static_cast<void>
  11  #else
  12  # define __ASSERT_VOID_CAST (void)
  13 @@ -59,13 +59,17 @@
  14    (__ASSERT_VOID_CAST ((expr) ? 0 :                                          \
  15                        (__assert (__STRING(expr), __FILE__, __LINE__,    \
  16                                        __ASSERT_FUNCTION), 0)))
  17 -
  18 +
  19 +/* Define some temporaries to workaround tinyx makedepend bug */
  20 +#define        __GNUC_PREREQ_2_6       __GNUC_PREREQ(2, 6)
  21 +#define        __GNUC_PREREQ_2_4       __GNUC_PREREQ(2, 4)
  22  /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
  23     which contains the name of the function currently being defined.
  24     This is broken in G++ before version 2.6.
  25     C9x has a similar variable called __func__, but prefer the GCC one since
  26     it demangles C++ function names.  */
  27 -# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
  28 +
  29 +# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4
  30  #   define __ASSERT_FUNCTION   __PRETTY_FUNCTION__
  31  # else
  32  #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
  33 diff -urN uClibc-0.9.29-0rig/include/complex.h uClibc-0.9.29/include/complex.h
  34 --- uClibc-0.9.29-0rig/include/complex.h        2002-05-09 10:15:21.000000000 +0200
  35 +++ uClibc-0.9.29/include/complex.h     2007-08-13 17:55:29.000000000 +0200
  36 @@ -33,7 +33,7 @@
  37  /* We might need to add support for more compilers here.  But since ISO
  38     C99 is out hopefully all maintained compilers will soon provide the data
  39     types `float complex' and `double complex'.  */
  40 -#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
  41 +#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97)
  42  # define _Complex __complex__
  43  #endif
  44
  45 diff -urN uClibc-0.9.29-0rig/include/features.h uClibc-0.9.29/include/features.h
  46 --- uClibc-0.9.29-0rig/include/features.h       2006-11-29 22:10:04.000000000 +0100
  47 +++ uClibc-0.9.29/include/features.h    2007-08-13 17:55:51.000000000 +0200
  48 @@ -143,7 +143,7 @@
  49
  50  /* Convenience macros to test the versions of glibc and gcc.
  51     Use them like this:
  52 -   #if __GNUC_PREREQ (2,8)
  53 +   #if __GNUC_PREREQ(2,8)
  54     ... code requiring gcc 2.8 or later ...
  55     #endif
  56     Note - they won't work for gcc1 or glibc1, since the _MINOR macros
  57 @@ -297,7 +297,7 @@
  58  /* uClibc does not support _FORTIFY_SOURCE */
  59  #undef _FORTIFY_SOURCE
  60  #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
  61 -    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
  62 +    && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0
  63  # if _FORTIFY_SOURCE > 1
  64  #  define __USE_FORTIFY_LEVEL 2
  65  # else
  66 @@ -366,7 +366,7 @@
  67  #endif /* !ASSEMBLER */
  68
  69  /* Decide whether we can define 'extern inline' functions in headers.  */
  70 -#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
  71 +#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \
  72      && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__
  73  # define __USE_EXTERN_INLINES  1
  74  #endif
  75 diff -urN uClibc-0.9.29-0rig/include/tgmath.h uClibc-0.9.29/include/tgmath.h
  76 --- uClibc-0.9.29-0rig/include/tgmath.h 2002-05-09 10:15:21.000000000 +0200
  77 +++ uClibc-0.9.29/include/tgmath.h      2007-08-13 17:56:17.000000000 +0200
  78 @@ -34,7 +34,7 @@
  79     do not try this for now and instead concentrate only on GNU CC.  Once
  80     we have more information support for other compilers might follow.  */
  81
  82 -#if __GNUC_PREREQ (2, 7)
  83 +#if __GNUC_PREREQ(2, 7)
  84
  85  # ifdef __NO_LONG_DOUBLE_MATH
  86  #  define __tgml(fct) fct