[Commits] r15870 - in /branches/eglibc-2_14: ./ ports/ ports/sysdeps/unix/sysv/linux/arm/ ports/sysdeps/unix/sysv/linux/mips/mips64/n64/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Nov 17 21:57:59 2011
New Revision: 15870

Log:
Merge changes between r15558 and r15869 from /fsf/glibc-2_14-branch.

Added:
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/ftw.c
      - copied unchanged from r15869, fsf/glibc-2_14-branch/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/ftw.c
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/ftw64.c
      - copied unchanged from r15869, fsf/glibc-2_14-branch/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/ftw64.c
Modified:
    branches/eglibc-2_14/   (props changed)
    branches/eglibc-2_14/ports/ChangeLog.arm
    branches/eglibc-2_14/ports/ChangeLog.mips
    branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/arm/clone.S

Propchange: branches/eglibc-2_14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 17 21:57:59 2011
@@ -1,1 +1,1 @@
-/fsf/glibc-2_14-branch:15225-15558
+/fsf/glibc-2_14-branch:15225-15869

Modified: branches/eglibc-2_14/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_14/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_14/ports/ChangeLog.arm Thu Nov 17 21:57:59 2011
@@ -1,3 +1,7 @@
+2011-08-02  Andrew Haley  <aph@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/clone.S: Mark as .cantunwind.
+
 2011-06-30  Richard Sandiford  <richard.sandiford@xxxxxxxxxx>
 
 	* sysdeps/arm/elf/start.S (_start): Align the constant pool to 4 bytes.

Modified: branches/eglibc-2_14/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_14/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_14/ports/ChangeLog.mips Thu Nov 17 21:57:59 2011
@@ -1,3 +1,8 @@
+2011-11-17  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips64/n64/ftw.c,
+	sysdeps/unix/sysv/linux/mips/mips64/n64/ftw64.c: New.
+
 2011-09-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #13109]

Modified: branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/arm/clone.S
==============================================================================
--- branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/arm/clone.S (original)
+++ branches/eglibc-2_14/ports/sysdeps/unix/sysv/linux/arm/clone.S Thu Nov 17 21:57:59 2011
@@ -81,8 +81,11 @@
 	RETINSTR(, lr)
 
 	cfi_startproc
-	cfi_undefined (lr)
+PSEUDO_END (__clone)
+
 1:
+	.fnstart
+	.cantunwind
 #ifdef RESET_PID
 	tst	ip, #CLONE_THREAD
 	bne	3f
@@ -116,6 +119,6 @@
 	@ and we are done, passing the return value through r0
 	b	PLTJMP(HIDDEN_JUMPTARGET(_exit))
 
-PSEUDO_END (__clone)
+	.fnend
 
 weak_alias (__clone, clone)

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