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