2 files changed, 16 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e39a104e135..75a7388f2c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        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  <dmantipov@yandex.ru>
 
         Get rid of some platform-specific functions examining window
diff --git a/src/Makefile.in b/src/Makefile.in
index 31de9714c65..c6a067a1ade 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -317,7 +317,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
   $(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 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
 .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.