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

[From: subversion at stage.maemo.org]

Author: timj
Date: 2008-12-02 18:32:29 +0200 (Tue, 02 Dec 2008)
New Revision: 16840

Modified:
   projects/haf/trunk/glib/ChangeLog
   projects/haf/trunk/glib/configure.in
   projects/haf/trunk/glib/glib/Makefile.am
Log:
2008-12-02 17:23:20  Tim Janik  <timj at imendio.com>

        * configure.in: provide flags needed for ARM backtraces for ARM CPUs only.

        * glib/Makefile.am: use ARM_FRAME_FLAGS from configure.in, fixes issues on
        i386 with the fix to NB#91723.



Modified: projects/haf/trunk/glib/ChangeLog
===================================================================
--- projects/haf/trunk/glib/ChangeLog	2008-12-02 15:13:56 UTC (rev 16839)
+++ projects/haf/trunk/glib/ChangeLog	2008-12-02 16:32:29 UTC (rev 16840)
@@ -1,3 +1,10 @@
+2008-12-02 17:23:20  Tim Janik  <timj at imendio.com>
+
+	* configure.in: provide flags needed for ARM backtraces for ARM CPUs only.
+
+	* glib/Makefile.am: use ARM_FRAME_FLAGS from configure.in, fixes issues on
+	i386 with the fix to NB#91723.
+
 2008-11-28 11:56:04  Tim Janik  <timj at imendio.com>
 
 	* glib/Makefile.am: added -fno-omit-frame-pointer and -mapcs-frame

Modified: projects/haf/trunk/glib/configure.in
===================================================================
--- projects/haf/trunk/glib/configure.in	2008-12-02 15:13:56 UTC (rev 16839)
+++ projects/haf/trunk/glib/configure.in	2008-12-02 16:32:29 UTC (rev 16840)
@@ -2425,6 +2425,9 @@
                            [special arm linux implementation])
         glib_memory_barrier_needed=yes
       fi
+      # some ARM CPUs and gcc versions need flags for proper backtraces
+      ARM_FRAME_FLAGS="-fno-omit-frame-pointer -mapcs-frame"
+      AC_SUBST(ARM_FRAME_FLAGS)
       ;;
     *)
       AC_MSG_RESULT([none])

Modified: projects/haf/trunk/glib/glib/Makefile.am
===================================================================
--- projects/haf/trunk/glib/glib/Makefile.am	2008-12-02 15:13:56 UTC (rev 16839)
+++ projects/haf/trunk/glib/glib/Makefile.am	2008-12-02 16:32:29 UTC (rev 16840)
@@ -33,11 +33,8 @@
 	-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 ))
+AM_CFLAGS = $(patsubst %, $(ARM_FRAME_FLAGS), $(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