[Commits] r16526 - in /branches/eglibc-2_15: ./ ports/ChangeLog.mips ports/sysdeps/mips/Makefile

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed Jan  4 16:35:09 2012
New Revision: 16526

Log:
Merge changes between r16494 and r16525 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/ports/ChangeLog.mips
    branches/eglibc-2_15/ports/sysdeps/mips/Makefile

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 16:35:09 2012
@@ -1,1 +1,2 @@
+/fsf/glibc-2_15-branch:16509-16525
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_15/ports/ChangeLog.mips Wed Jan  4 16:35:09 2012
@@ -1,3 +1,8 @@
+2012-01-04  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/mips/Makefile: Compile initfini.c, pt-initfini.c with
+	-fno-unwind-tables.
+
 2012-01-03  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/backtrace.c: New file, including ia64 backtrace.c.

Modified: branches/eglibc-2_15/ports/sysdeps/mips/Makefile
==============================================================================
--- branches/eglibc-2_15/ports/sysdeps/mips/Makefile (original)
+++ branches/eglibc-2_15/ports/sysdeps/mips/Makefile Wed Jan  4 16:35:09 2012
@@ -20,4 +20,12 @@
 CFLAGS-tst-backtrace6.c += -funwind-tables
 endif
 
+ifeq ($(subdir),csu)
+CFLAGS-initfini.s += -fno-unwind-tables
+endif
+
+ifeq ($(subdir),nptl)
+CFLAGS-pt-initfini.s += -fno-unwind-tables
+endif
+
 ASFLAGS-.os += $(pic-ccflag)

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits