[Patches] Trunk merge 2011-12-02

["Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>]

I've merged from FSF to EGLIBC trunk.  As this brought in SH backtrace 
I've also applied this change adding appropriate flags for 
backtrace-related files on SH like those on ARM.

Index: sysdeps/sh/Makefile
===================================================================
--- sysdeps/sh/Makefile	(revision 16069)
+++ sysdeps/sh/Makefile	(working copy)
@@ -1,3 +1,11 @@
 ifeq ($(subdir),gmon)
 sysdep_routines += _mcount
 endif
+
+ifeq ($(subdir),debug)
+CFLAGS-backtrace.c += -funwind-tables
+CFLAGS-tst-backtrace2.c += -funwind-tables
+CFLAGS-tst-backtrace3.c += -funwind-tables
+CFLAGS-tst-backtrace4.c += -funwind-tables
+CFLAGS-tst-backtrace5.c += -funwind-tables
+endif
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc	(revision 16069)
+++ ChangeLog.eglibc	(working copy)
@@ -1,3 +1,9 @@
+2011-12-02  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/sh/Makefile (CFLAGS-backtrace.c)
+	(CFLAGS-tst-backtrace2.c, CFLAGS-tst-backtrace3.c)
+	(CFLAGS-tst-backtrace4.c, CFLAGS-tst-backtrace5.c): Define.
+
 2011-12-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 	    Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
 

-- 
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx
_______________________________________________
Patches mailing list
Patches@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/patches