diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-09-20 06:17:44 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-09-20 06:17:44 -0400 |
| commit | ad4c8083673d833dddc1934c5629654a3de491ef (patch) | |
| tree | dcd57d74f358f8450607a17820226af501cba809 | |
| parent | 3054cd0150ff169bc57bc3044dda2b29d563e357 (diff) | |
| download | emacs-ad4c8083673d833dddc1934c5629654a3de491ef.tar.gz | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/config.in | 31 | ||||
| -rwxr-xr-x | autogen/configure | 2 |
2 files changed, 29 insertions, 4 deletions
diff --git a/autogen/config.in b/autogen/config.in index 9b2bbdfc949..c45b9920d06 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -127,6 +127,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ */ #undef FIRST_PTY_LETTER +/* Without the following workaround, Emacs runs slowly on OS X 10.8. + The workaround disables some useful run-time checking, so it + should be conditional to the platforms with the performance bug. + Perhaps Apple will fix this some day; also see m4/extern-inline.m4. */ +#if defined __APPLE__ && defined __GNUC__ +# ifndef _DONT_USE_CTYPE_INLINE_ +# define _DONT_USE_CTYPE_INLINE_ +# endif +# ifndef _FORTIFY_SOURCE +# define _FORTIFY_SOURCE 0 +# endif +#endif + + /* Enable compile-time and run-time bounds-checking, and some warnings, without upsetting glibc 2.15+. */ #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ @@ -1642,20 +1656,28 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ '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 Apple's platforms, as Libc at least - through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g., + Suppress the use of extern inline on problematic Apple configurations, as + Libc at least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. Perhaps Apple will fix this some day. */ +#if (defined __APPLE__ \ + && ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus))) +# define _GL_EXTERN_INLINE_APPLE_BUG +#endif #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined __APPLE__) + && !defined _GL_EXTERN_INLINE_APPLE_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 __APPLE__) + && !defined _GL_EXTERN_INLINE_APPLE_BUG) # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -1663,6 +1685,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ # define _GL_INLINE extern inline # endif # define _GL_EXTERN_INLINE extern +# define _GL_EXTERN_INLINE_IN_USE #else # define _GL_INLINE static _GL_UNUSED # define _GL_EXTERN_INLINE static _GL_UNUSED diff --git a/autogen/configure b/autogen/configure index c5ee6973db8..9010a4cac5b 100755 --- a/autogen/configure +++ b/autogen/configure @@ -17561,6 +17561,8 @@ fi + + # Configure gnulib. Although this does not affect CFLAGS or LIBS permanently. # it temporarily reverts them to their pre-pkg-config values, # because gnulib needs to work with both src (which uses the |