[commits] r11235 - in /fsf/glibc-2_12-branch/ports: ./ sysdeps/unix/mips/mips64/n32/ sysdeps/unix/mips/mips64/n64/ sysdeps/unix/sysv/l...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Aug 14 00:05:40 2010
New Revision: 11235

Log:
Import glibc-ports-2.12 for 2010-08-14

Modified:
    fsf/glibc-2_12-branch/ports/ChangeLog.mips
    fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n32/sysdep.h
    fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n64/sysdep.h
    fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h

Modified: fsf/glibc-2_12-branch/ports/ChangeLog.mips
==============================================================================
--- fsf/glibc-2_12-branch/ports/ChangeLog.mips (original)
+++ fsf/glibc-2_12-branch/ports/ChangeLog.mips Sat Aug 14 00:05:40 2010
@@ -1,3 +1,14 @@
+2010-08-13  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/kernel-features.h
+	(__ASSUME_GETDENTS64_SYSCALL): Undefine for n32 ABI before 2.6.35.
+
+2010-08-13  Chandrakala Chavva  <cchavva@xxxxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/mips/mips64/n64/sysdep.h (PSEUDO): Add 'nop' in
+	jump delay slot.
+	* sysdeps/unix/mips/mips64/n32/sysdep.h (PSEUDO): Ditto.
+
 2010-05-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c,

Modified: fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n32/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n32/sysdep.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n32/sysdep.h Sat Aug 14 00:05:40 2010
@@ -45,6 +45,7 @@
   .set noreorder;							      \
   .align 2;								      \
   99: j __syscall_error;						      \
+  nop;                                                                        \
   ENTRY(name)								      \
   .set noreorder;							      \
   li v0, SYS_ify(syscall_name);						      \

Modified: fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n64/sysdep.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n64/sysdep.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/mips/mips64/n64/sysdep.h Sat Aug 14 00:05:40 2010
@@ -45,6 +45,7 @@
   .set noreorder;							      \
   .align 2;								      \
   99: j __syscall_error;						      \
+  nop;                                                                        \
   ENTRY(name)								      \
   .set noreorder;							      \
   li v0, SYS_ify(syscall_name);						      \

Modified: fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
==============================================================================
--- fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h (original)
+++ fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h Sat Aug 14 00:05:40 2010
@@ -38,3 +38,9 @@
 #endif
 
 #include_next <kernel-features.h>
+
+/* The n32 syscall ABI did not have a getdents64 syscall until
+   2.6.35.  */
+#if _MIPS_SIM == _ABIN32 && __LINUX_KERNEL_VERSION < 0x020623
+# undef __ASSUME_GETDENTS64_SYSCALL
+#endif