aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-09-19 20:41:37 -0700
committerPaul Eggert2013-09-19 20:41:37 -0700
commitf5f0132bc9cfc037fa6a22983061704748d4091f (patch)
tree3e817b1ce29dfa64950546520981df9eb57396f1
parent2b943ba68988e9925cf50f4df37550f0342370dd (diff)
downloademacs-f5f0132bc9cfc037fa6a22983061704748d4091f.tar.gz
emacs-f5f0132bc9cfc037fa6a22983061704748d4091f.zip
Work around performance bug on OS X 10.8 and earlier.
Perhaps Apple will fix this bug some day. See the thread starting with Daniel Colascione's email in: http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00343.html * configure.ac (FORTIFY_SOUR): New verbatim section.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac18
2 files changed, 26 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d21714922c..07967de1cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
12013-09-20 Paul Eggert <eggert@cs.ucla.edu>
2
3 Work around performance bug on OS X 10.8 and earlier.
4 Perhaps Apple will fix this bug some day.
5 See the thread starting with Daniel Colascione's email in:
6 http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00343.html
7 * configure.ac (FORTIFY_SOUR): New verbatim section.
8
12013-09-19 Paul Eggert <eggert@cs.ucla.edu> 92013-09-19 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 Merge from gnulib, incorporating: 11 Merge from gnulib, incorporating:
diff --git a/configure.ac b/configure.ac
index fe326623571..8ff33e779a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4703,6 +4703,24 @@ AC_SUBST(CYGWIN_OBJ)
4703AC_SUBST(PRE_ALLOC_OBJ) 4703AC_SUBST(PRE_ALLOC_OBJ)
4704AC_SUBST(POST_ALLOC_OBJ) 4704AC_SUBST(POST_ALLOC_OBJ)
4705 4705
4706dnl Call this 'FORTIFY_SOUR' so that it sorts before the 'FORTIFY_SOURCE'
4707dnl verbatim defined above. The tricky name is apropos, as this hack
4708dnl makes Fortify go sour!
4709AH_VERBATIM([FORTIFY_SOUR],
4710[/* Without the following workaround, Emacs runs slowly on OS X 10.8.
4711 The workaround disables some useful run-time checking, so it
4712 should be conditional to the platforms with the performance bug.
4713 Perhaps Apple will fix this some day; also see m4/extern-inline.m4. */
4714#if defined __APPLE__ && defined __GNUC__
4715# ifndef _DONT_USE_CTYPE_INLINE_
4716# define _DONT_USE_CTYPE_INLINE_
4717# endif
4718# ifndef _FORTIFY_SOURCE
4719# define _FORTIFY_SOURCE 0
4720# endif
4721#endif
4722])
4723
4706# Configure gnulib. Although this does not affect CFLAGS or LIBS permanently. 4724# Configure gnulib. Although this does not affect CFLAGS or LIBS permanently.
4707# it temporarily reverts them to their pre-pkg-config values, 4725# it temporarily reverts them to their pre-pkg-config values,
4708# because gnulib needs to work with both src (which uses the 4726# because gnulib needs to work with both src (which uses the