[maemo-commits] [maemo-commits] r16797 - in projects/haf/trunk/glib: . glib

[From: subversion at stage.maemo.org]

Author: timj
Date: 2008-11-28 12:57:58 +0200 (Fri, 28 Nov 2008)
New Revision: 16797

Modified:
   projects/haf/trunk/glib/ChangeLog
   projects/haf/trunk/glib/glib/Makefile.am
Log:
2008-11-28 11:56:04  Tim Janik  <timj at imendio.com>

        * glib/Makefile.am: added -fno-omit-frame-pointer and -mapcs-frame
        compiler flags to gmessages.c and gtestutils.c, so backtraces
        through noreturn functions work on ARM with gcc-4.2.1. NB#91723.



Modified: projects/haf/trunk/glib/ChangeLog
===================================================================
--- projects/haf/trunk/glib/ChangeLog	2008-11-28 10:48:44 UTC (rev 16796)
+++ projects/haf/trunk/glib/ChangeLog	2008-11-28 10:57:58 UTC (rev 16797)
@@ -1,3 +1,9 @@
+2008-11-28 11:56:04  Tim Janik  <timj at imendio.com>
+
+	* glib/Makefile.am: added -fno-omit-frame-pointer and -mapcs-frame
+	compiler flags to gmessages.c and gtestutils.c, so backtraces
+	through noreturn functions work on ARM with gcc-4.2.1. NB#91723.
+
 2008-10-13  Sven Herzberg  <sven at imendio.com>
 
 	Bug 556101 – static mutex yields warnings with g++

Modified: projects/haf/trunk/glib/glib/Makefile.am
===================================================================
--- projects/haf/trunk/glib/glib/Makefile.am	2008-11-28 10:48:44 UTC (rev 16796)
+++ projects/haf/trunk/glib/glib/Makefile.am	2008-11-28 10:57:58 UTC (rev 16797)
@@ -32,6 +32,12 @@
 	-DGLIB_COMPILATION 		\
 	-DPCRE_STATIC
 
+# force frame-pointers for source files with noreturn functions for backtraces
+AM_CFLAGS = $(patsubst %, \
+		-fno-omit-frame-pointer -mapcs-frame, \
+		$(filter $(<F), gmessages.c gtestutils.c ))
+
+
 glib.def: glib.symbols
 	(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > glib.def
 
@@ -166,12 +172,6 @@
 	gprintf.c		\
 	gprintfint.h
 
-GMESSAGES = gmessages
-$(GMESSAGES).o $(GMESSAGES).obj $(GMESSAGES).lo: $(GMESSAGES).c
-	$(MAKE) $(AM_MAKEFLAGS) \
-		AM_CFLAGS='$(AM_CLFAGS) -fno-omit-frame-pointer' \
-		GMESSAGES=dummy '$@'
-
 EXTRA_libglib_2_0_la_SOURCES = \
 	giounix.c	\
 	giowin32.c	\