[commits] r13356 - in /branches/eglibc-2_13/ports: ./ sysdeps/unix/sysv/linux/arm/eabi/ sysdeps/unix/sysv/linux/mips/mips64/n64/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Apr  1 12:44:26 2011
New Revision: 13356

Log:
Merge changes between r13228 and r13355 from /fsf/glibc-2_13-branch.

Modified:
    branches/eglibc-2_13/ports/ChangeLog.arm
    branches/eglibc-2_13/ports/ChangeLog.mips
    branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S
    branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list

Modified: branches/eglibc-2_13/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_13/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_13/ports/ChangeLog.arm Fri Apr  1 12:44:26 2011
@@ -1,3 +1,8 @@
+2011-04-01  Ryosei Takagi  <ryosei@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S:
+	Save and restore r7, and also adjust sp.
+
 2011-03-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/arm/eabi/__longjmp.S, sysdeps/arm/eabi/bits/fenv.h,

Modified: branches/eglibc-2_13/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_13/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_13/ports/ChangeLog.mips Fri Apr  1 12:44:26 2011
@@ -1,3 +1,8 @@
+2011-04-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list: Add
+	sync_file_range.
+
 2011-01-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/mman.h (MADV_HUGEPAGE,

Modified: branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S (original)
+++ branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S Fri Apr  1 12:44:26 2011
@@ -52,13 +52,15 @@
 	cfi_remember_state;			\
 	cmp	sp, reg;			\
 	bls	.Lok;				\
+	str	r7, [sp, #-4]!;			\
+	cfi_adjust_cfa_offset (4);		\
+	cfi_rel_offset (r7, 0);			\
 	mov	r5, r0;				\
 	cfi_undefined (r5);			\
 	mov	r7, #SYS_ify(sigaltstack);	\
-	cfi_undefined (r7);			\
 	mov	r0, #0;				\
-	sub	sp, sp, #16; /* >= sizeof (stack_t) */ \
-	cfi_adjust_cfa_offset (16);		\
+	sub	sp, sp, #12; /* == sizeof (stack_t) */ \
+	cfi_adjust_cfa_offset (12);		\
 	cfi_remember_state;			\
 	mov	r1, sp;				\
 	swi	#0;				\
@@ -74,6 +76,11 @@
 	cmp	r2, r3;				\
 	bhi	.Lok2;				\
 .Lfail:						\
+	add	sp, sp, #12;			\
+	cfi_adjust_cfa_offset (-12);		\
+	ldr	r7, [sp], #4;			\
+	cfi_adjust_cfa_offset (-4);		\
+	cfi_restore (r7);			\
 	CALL_FAIL				\
 	cfi_restore_state;			\
 .Lok2:						\

Modified: branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list (original)
+++ branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list Fri Apr  1 12:44:26 2011
@@ -1,4 +1,6 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
+
+sync_file_range	-	sync_file_range	i:iiii	sync_file_range
 
 prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64