diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-03-23 17:56:28 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-03-23 17:56:28 +0000 |
commit | 03205ec7407b379602abd8bb0c41c62fe28151f4 (patch) | |
tree | 76657f61fec7fb956d0f09834ab6947f3b8aa4a6 /toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch | |
parent | fc9181c4e25fa55aa13ff2b2960fe45d68080100 (diff) | |
download | mtk-20170518-03205ec7407b379602abd8bb0c41c62fe28151f4.zip mtk-20170518-03205ec7407b379602abd8bb0c41c62fe28151f4.tar.gz mtk-20170518-03205ec7407b379602abd8bb0c41c62fe28151f4.tar.bz2 |
clean up uclibc patch/config version handling a bit
SVN-Revision: 14994
Diffstat (limited to 'toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch')
-rw-r--r-- | toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch b/toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch new file mode 100644 index 0000000..57b6d30 --- /dev/null +++ b/toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch @@ -0,0 +1,82 @@ +--- a/include/assert.h ++++ b/include/assert.h +@@ -31,7 +31,7 @@ + #define _ASSERT_H 1 + #include <features.h> + +-#if defined __cplusplus && __GNUC_PREREQ (2,95) ++#if defined __cplusplus && __GNUC_PREREQ(2,95) + # define __ASSERT_VOID_CAST static_cast<void> + #else + # define __ASSERT_VOID_CAST (void) +@@ -59,13 +59,17 @@ __END_DECLS + (__ASSERT_VOID_CAST ((expr) ? 0 : \ + (__assert (__STRING(expr), __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) +- ++ ++/* Define some temporaries to workaround tinyx makedepend bug */ ++#define __GNUC_PREREQ_2_6 __GNUC_PREREQ(2, 6) ++#define __GNUC_PREREQ_2_4 __GNUC_PREREQ(2, 4) + /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' + which contains the name of the function currently being defined. + This is broken in G++ before version 2.6. + C9x has a similar variable called __func__, but prefer the GCC one since + it demangles C++ function names. */ +-# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) ++ ++# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4 + # define __ASSERT_FUNCTION __PRETTY_FUNCTION__ + # else + # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +--- a/include/complex.h ++++ b/include/complex.h +@@ -33,7 +33,7 @@ __BEGIN_DECLS + /* We might need to add support for more compilers here. But since ISO + C99 is out hopefully all maintained compilers will soon provide the data + types `float complex' and `double complex'. */ +-#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97) ++#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97) + # define _Complex __complex__ + #endif + +--- a/include/features.h ++++ b/include/features.h +@@ -143,7 +143,7 @@ + + /* Convenience macros to test the versions of glibc and gcc. + Use them like this: +- #if __GNUC_PREREQ (2,8) ++ #if __GNUC_PREREQ(2,8) + ... code requiring gcc 2.8 or later ... + #endif + Note - they won't work for gcc1 or glibc1, since the _MINOR macros +@@ -297,7 +297,7 @@ + /* uClibc does not support _FORTIFY_SOURCE */ + #undef _FORTIFY_SOURCE + #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ +- && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 ++ && __GNUC_PREREQ(4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 + # if _FORTIFY_SOURCE > 1 + # define __USE_FORTIFY_LEVEL 2 + # else +@@ -366,7 +366,7 @@ + #endif /* !ASSEMBLER */ + + /* Decide whether we can define 'extern inline' functions in headers. */ +-#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \ ++#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \ + && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ + # define __USE_EXTERN_INLINES 1 + #endif +--- a/include/tgmath.h ++++ b/include/tgmath.h +@@ -34,7 +34,7 @@ + do not try this for now and instead concentrate only on GNU CC. Once + we have more information support for other compilers might follow. */ + +-#if __GNUC_PREREQ (2, 7) ++#if __GNUC_PREREQ(2, 7) + + # ifdef __NO_LONG_DOUBLE_MATH + # define __tgml(fct) fct |