[Emacs-diffs] /srv/bzr/emacs/trunk r112239: Fix --enable-profiling bug introduced by 2013-02-25 change.

[Paul Eggert]

------------------------------------------------------------
revno: 112239
fixes bug: http://debbugs.gnu.org/13783
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-06 23:21:40 -0700
message:
  Fix --enable-profiling bug introduced by 2013-02-25 change.
  
  This bug was introduced by my 2013-02-25 change that simplified
  data_start configuration.  Without this change, on GNU/Linux
  an Emacs configured with --enable-profiling fails immediately
  due to a profiler signal.
  * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Append -pg if profiling
  and if not on GNU/Linux or FreeBSD.
  * lib/Makefile.am (AM_CFLAGS): Add $(PROFILING_CFLAGS), so that
  lib/*.o is profiled too.
  * src/Makefile.in: Compile with $(PROFILING_CFLAGS), but do not link
  with these flags.  On platforms where special flags are needed
  when linking temacs, the flags are now in LD_SWITCH_SYSTEM_TEMACS.
  (ALL_CFLAGS): Remove $(PROFILING_CFLAGS).
  (.c.o, .m.o): Compile with $(PROFILING_CFLAGS).
modified:
  ChangeLog
  configure.ac
  lib/Makefile.am
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-04-04 03:46:25 +0000
+++ b/ChangeLog 2013-04-07 06:21:40 +0000
@@ -1,3 +1,11 @@
+2013-04-07  Paul Eggert  <address@hidden>
+
+       Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
+       * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Append -pg if profiling
+       and if not on GNU/Linux or FreeBSD.
+       * lib/Makefile.am (AM_CFLAGS): Add $(PROFILING_CFLAGS), so that
+       lib/*.o is profiled too.
+
 2013-03-30  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2013-03-27 05:13:31 +0000
+++ b/configure.ac      2013-04-07 06:21:40 +0000
@@ -4185,6 +4185,13 @@
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
 
+if test x$ac_enable_profiling != x ; then
+  case $opsys in
+    *freebsd | gnu-linux) ;;
+    *) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -pg" ;;
+  esac
+fi
+
 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
 
 ## Common for all window systems

=== modified file 'lib/Makefile.am'
--- a/lib/Makefile.am   2013-02-01 06:30:51 +0000
+++ b/lib/Makefile.am   2013-04-07 06:21:40 +0000
@@ -4,7 +4,7 @@
 MOSTLYCLEANFILES =
 noinst_LIBRARIES =
 
-AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
+AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src
 
 include gnulib.mk

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-04-07 04:41:19 +0000
+++ b/src/ChangeLog     2013-04-07 06:21:40 +0000
@@ -1,3 +1,16 @@
+2013-04-07  Paul Eggert  <address@hidden>
+
+       Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
+       This bug was introduced by my 2013-02-25 change that simplified
+       data_start configuration.  Without this change, on GNU/Linux
+       an Emacs configured with --enable-profiling fails immediately
+       due to a profiler signal.
+       * Makefile.in: Compile with $(PROFILING_CFLAGS), but do not link
+       with these flags.  On platforms where special flags are needed
+       when linking temacs, the flags are now in LD_SWITCH_SYSTEM_TEMACS.
+       (ALL_CFLAGS): Remove $(PROFILING_CFLAGS).
+       (.c.o, .m.o): Compile with $(PROFILING_CFLAGS).
+
 2013-04-07  Dmitry Antipov  <address@hidden>
 
        Get rid of some platform-specific functions examining window

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2013-03-13 18:42:22 +0000
+++ b/src/Makefile.in   2013-04-07 06:21:40 +0000
@@ -317,7 +317,7 @@
   $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
   $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
   $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
-  $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) $(PROFILING_CFLAGS) \
+  $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
   $(LIBGNUTLS_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
@@ -325,10 +325,10 @@
 .SUFFIXES: .m
 .c.o:
        @$(MKDEPDIR)
-       $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
+       $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(PROFILING_CFLAGS) $<
 .m.o:
        @$(MKDEPDIR)
-       $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
+       $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $(PROFILING_CFLAGS) $<
 
 ## lastfile must follow all files whose initialized data areas should
 ## be dumped as pure by dump-emacs.