From 6a3948b87d6df36207df685e726ed1e972a01d28 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 4 Aug 2014 11:30:33 -0700 Subject: [PATCH] extern-inline: port to FreeBSD, DragonFly * m4/extern-inline.m4 (gl_EXTERN_INLINE): Also assume the bug is present if either __DragonFly__ or __FreeBSD__ is defined. FreeBSD problem reported by Andrey Borzenkov in: http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html Also, worry about __APPLE__ only if __MACH__ is also defined, as this is more consistent with the rest of gnulib. (_GL_EXTERN_INLINE_STDHEADER_BUG): Rename this internal macro from _GL_EXTERN_INLINE_APPLE_BUG, since the bug is not limited to Apple. --- ChangeLog | 12 ++++++++++++ m4/extern-inline.m4 | 31 +++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59ce3dc..bdf743a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2014-08-04 Paul Eggert + + extern-inline: port to FreeBSD, DragonFly + * m4/extern-inline.m4 (gl_EXTERN_INLINE): Also assume the bug + is present if either __DragonFly__ or __FreeBSD__ is defined. + FreeBSD problem reported by Andrey Borzenkov in: + http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + Also, worry about __APPLE__ only if __MACH__ is also defined, + as this is more consistent with the rest of gnulib. + (_GL_EXTERN_INLINE_STDHEADER_BUG): Rename this internal macro from + _GL_EXTERN_INLINE_APPLE_BUG, since the bug is not limited to Apple. + 2014-08-01 Siddhesh Poyarekar regex: Make #if/#ifdef usage consistent for DEBUG diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 240150e..7f1bb39 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -19,13 +19,28 @@ AC_DEFUN([gl_EXTERN_INLINE], 'reference to static identifier "f" in extern inline function'. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - Suppress the use of extern inline on problematic Apple configurations. - OS X 10.8 and earlier mishandle it; see, e.g., - . + Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) + on configurations that mistakenly use 'static inline' to implement + functions or macros in standard C headers like . For example, + if isdigit is mistakenly implemented via a static inline function, + a program containing an extern inline function that calls isdigit + may not work since the C standard prohibits extern inline functions + from calling static functions. This bug is known to occur on: + + OS X 10.8 and earlier; see: + http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + + DragonFly; see + http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + + FreeBSD; see: + http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and for clang but remains for g++; see . - Perhaps Apple will fix this some day. */ -#if (defined __APPLE__ \ + Assume DragonFly and FreeBSD will be similar. */ +#if (((defined __APPLE__ && defined __MACH__) \ + || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ && ! defined __clang__) \ @@ -33,19 +48,19 @@ AC_DEFUN([gl_EXTERN_INLINE], && (defined __GNUC__ || defined __cplusplus)) \ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ && defined __GNUC__ && ! defined __cplusplus)))) -# define _GL_EXTERN_INLINE_APPLE_BUG +# define _GL_EXTERN_INLINE_STDHEADER_BUG #endif #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE_IN_USE #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) + && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) -- 1.9.3