generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc."

Browse Source
This commit is contained in:
Elliott Hughes 2014-08-29 23:08:00 +00:00 committed by Gerrit Code Review
commit bbe06e0da1
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/stdatomic.h
View File

@ -138,7 +138,7 @@ using std::atomic_uintmax_t;
#if __has_extension(c_atomic) || __has_extension(cxx_atomic) #if __has_extension(c_atomic) || __has_extension(cxx_atomic)
#define __CLANG_ATOMICS #define __CLANG_ATOMICS
#elif __GNUC_PREREQ__(4, 7) #elif __GNUC_PREREQ(4, 7)
#define __GNUC_ATOMICS #define __GNUC_ATOMICS
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define __SYNC_ATOMICS #define __SYNC_ATOMICS

38
libc/include/sys/cdefs.h
View File

@ -60,18 +60,18 @@
* or later, for e.g. features that appeared in a particular version * or later, for e.g. features that appeared in a particular version
* of GNU C. Usage: * of GNU C. Usage:
* *
* #if __GNUC_PREREQ__(major, minor) * #if __GNUC_PREREQ(major, minor)
* ...cool feature... * ...cool feature...
* #else * #else
* ...delete feature... * ...delete feature...
* #endif * #endif
*/ */
#ifdef __GNUC__ #ifdef __GNUC__
#define __GNUC_PREREQ__(x, y) \ #define __GNUC_PREREQ(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \
(__GNUC__ > (x))) (__GNUC__ > (x)))
#else #else
#define __GNUC_PREREQ__(x, y) 0 #define __GNUC_PREREQ(x, y) 0
#endif #endif
#include <sys/cdefs_elf.h> #include <sys/cdefs_elf.h>
@ -163,7 +163,7 @@
* GCC2 provides __extension__ to suppress warnings for various GNU C * GCC2 provides __extension__ to suppress warnings for various GNU C
* language extensions under "-ansi -pedantic". * language extensions under "-ansi -pedantic".
*/ */
#if !__GNUC_PREREQ__(2, 0) #if !__GNUC_PREREQ(2, 0)
#define __extension__ /* delete __extension__ if non-gcc or gcc1 */ #define __extension__ /* delete __extension__ if non-gcc or gcc1 */
#endif #endif
@ -175,7 +175,7 @@
* these work for GNU C++ (modulo a slight glitch in the C++ grammar * these work for GNU C++ (modulo a slight glitch in the C++ grammar
* in the distribution version of 2.5.5). * in the distribution version of 2.5.5).
*/ */
#if !__GNUC_PREREQ__(2, 5) #if !__GNUC_PREREQ(2, 5)
#define __attribute__(x) /* delete __attribute__ if non-gcc or gcc1 */ #define __attribute__(x) /* delete __attribute__ if non-gcc or gcc1 */
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
#define __dead __volatile #define __dead __volatile
@ -189,7 +189,7 @@
#define __pure #define __pure
#endif #endif
#if __GNUC_PREREQ__(2, 7) #if __GNUC_PREREQ(2, 7)
#define __unused __attribute__((__unused__)) #define __unused __attribute__((__unused__))
#else #else
#define __unused /* delete */ #define __unused /* delete */
@ -197,13 +197,13 @@
#define __pure2 __attribute__((__const__)) /* Android-added: used by FreeBSD libm */ #define __pure2 __attribute__((__const__)) /* Android-added: used by FreeBSD libm */
#if __GNUC_PREREQ__(3, 1) #if __GNUC_PREREQ(3, 1)
#define __used __attribute__((__used__)) #define __used __attribute__((__used__))
#else #else
#define __used /* delete */ #define __used /* delete */
#endif #endif
#if __GNUC_PREREQ__(2, 7) #if __GNUC_PREREQ(2, 7)
#define __packed __attribute__((__packed__)) #define __packed __attribute__((__packed__))
#define __aligned(x) __attribute__((__aligned__(x))) #define __aligned(x) __attribute__((__aligned__(x)))
#define __section(x) __attribute__((__section__(x))) #define __section(x) __attribute__((__section__(x)))
@ -217,11 +217,11 @@
#define __section(x) error: no __section for this compiler #define __section(x) error: no __section for this compiler
#endif #endif
#if !__GNUC_PREREQ__(2, 8) #if !__GNUC_PREREQ(2, 8)
#define __extension__ #define __extension__
#endif #endif
#if __GNUC_PREREQ__(2, 8) #if __GNUC_PREREQ(2, 8)
#define __statement(x) __extension__(x) #define __statement(x) __extension__(x)
#elif defined(lint) #elif defined(lint)
#define __statement(x) (0) #define __statement(x) (0)
@ -241,7 +241,7 @@
#if defined(__STDC__VERSION__) && __STDC_VERSION__ >= 199901L #if defined(__STDC__VERSION__) && __STDC_VERSION__ >= 199901L
#define __restrict restrict #define __restrict restrict
#else #else
#if !__GNUC_PREREQ__(2, 92) #if !__GNUC_PREREQ(2, 92)
#define __restrict /* delete __restrict when not supported */ #define __restrict /* delete __restrict when not supported */
#endif #endif
#endif #endif
@ -251,9 +251,9 @@
* in GCC 2.95. * in GCC 2.95.
*/ */
#if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L) #if !defined(__STDC_VERSION__) || !(__STDC_VERSION__ >= 199901L)
#if __GNUC_PREREQ__(2, 6) #if __GNUC_PREREQ(2, 6)
#define __func__ __PRETTY_FUNCTION__ #define __func__ __PRETTY_FUNCTION__
#elif __GNUC_PREREQ__(2, 4) #elif __GNUC_PREREQ(2, 4)
#define __func__ __FUNCTION__ #define __func__ __FUNCTION__
#else #else
#define __func__ "" #define __func__ ""
@ -272,7 +272,7 @@
* register values. This is gcc specific, the version is more or less * register values. This is gcc specific, the version is more or less
* arbitrary, might work with older compilers. * arbitrary, might work with older compilers.
*/ */
#if __GNUC_PREREQ__(2, 95) #if __GNUC_PREREQ(2, 95)
#define __insn_barrier() __asm __volatile("":::"memory") #define __insn_barrier() __asm __volatile("":::"memory")
#else #else
#define __insn_barrier() /* */ #define __insn_barrier() /* */
@ -306,7 +306,7 @@
* basic block reordering that this affects can often generate * basic block reordering that this affects can often generate
* larger code. * larger code.
*/ */
#if __GNUC_PREREQ__(2, 96) #if __GNUC_PREREQ(2, 96)
#define __predict_true(exp) __builtin_expect((exp) != 0, 1) #define __predict_true(exp) __builtin_expect((exp) != 0, 1)
#define __predict_false(exp) __builtin_expect((exp) != 0, 0) #define __predict_false(exp) __builtin_expect((exp) != 0, 0)
#else #else
@ -314,7 +314,7 @@
#define __predict_false(exp) (exp) #define __predict_false(exp) (exp)
#endif #endif
#if __GNUC_PREREQ__(2, 96) #if __GNUC_PREREQ(2, 96)
#define __noreturn __attribute__((__noreturn__)) #define __noreturn __attribute__((__noreturn__))
#define __mallocfunc __attribute__((malloc)) #define __mallocfunc __attribute__((malloc))
#define __purefunc __attribute__((pure)) #define __purefunc __attribute__((pure))
@ -324,19 +324,19 @@
#define __purefunc #define __purefunc
#endif #endif
#if __GNUC_PREREQ__(3, 1) #if __GNUC_PREREQ(3, 1)
#define __always_inline __attribute__((__always_inline__)) #define __always_inline __attribute__((__always_inline__))
#else #else
#define __always_inline #define __always_inline
#endif #endif
#if __GNUC_PREREQ__(3, 4) #if __GNUC_PREREQ(3, 4)
#define __wur __attribute__((__warn_unused_result__)) #define __wur __attribute__((__warn_unused_result__))
#else #else
#define __wur #define __wur
#endif #endif
#if __GNUC_PREREQ__(4, 3) #if __GNUC_PREREQ(4, 3)
#define __errordecl(name, msg) extern void name(void) __attribute__((__error__(msg))) #define __errordecl(name, msg) extern void name(void) __attribute__((__error__(msg)))
#define __warnattr(msg) __attribute__((__warning__(msg))) #define __warnattr(msg) __attribute__((__warning__(msg)))
#else #else

4
libm/include/math.h
View File

@ -36,11 +36,11 @@ extern const union __nan_un {
float __uf; float __uf;
} __nan; } __nan;
#if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800) #if __GNUC_PREREQ(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
#define __MATH_BUILTIN_CONSTANTS #define __MATH_BUILTIN_CONSTANTS
#endif #endif
#if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER) #if __GNUC_PREREQ(3, 0) && !defined(__INTEL_COMPILER)
#define __MATH_BUILTIN_RELOPS #define __MATH_BUILTIN_RELOPS
#endif #endif