diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | misc/sys/cdefs.h | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d5fd959e0d..436b3df201 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com> + [BZ #17266] + * misc/sys/cdefs.h: Define __extern_always_inline for clang + 4.2 and newer. + [BZ #17370] * libio/wfileops.c (do_ftell_wide): Free OUT on error path. diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 01e81ba9f1..711ac1d912 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -321,8 +321,14 @@ inline semantics, unless -fgnu89-inline is used. Using __GNUC_STDC_INLINE__ or __GNUC_GNU_INLINE is not a good enough check for gcc because gcc versions older than 4.3 may define these macros and still not guarantee GNU inlining - semantics. */ -#if !defined __cplusplus || __GNUC_PREREQ (4,3) + semantics. + + clang++ identifies itself as gcc-4.2, but has support for GNU inlining + semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and + __GNUC_GNU_INLINE__ macro definitions. */ +#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \ + || (defined __clang__ && (defined __GNUC_STDC_INLINE__ \ + || defined __GNUC_GNU_INLINE__))) # if defined __GNUC_STDC_INLINE__ || defined __cplusplus # define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) # define __extern_always_inline \ |