[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r9201 - in /fsf/trunk/ports: ./ sysdeps/arm/ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/arm/bits/ sysdeps/unix/sys...
- To: commits@xxxxxxxxxx
- Subject: [commits] r9201 - in /fsf/trunk/ports: ./ sysdeps/arm/ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/arm/bits/ sysdeps/unix/sys...
- From: eglibc@xxxxxxxxxx
- Date: Sat, 07 Nov 2009 08:04:47 -0000
Author: eglibc
Date: Sat Nov 7 00:04:47 2009
New Revision: 9201
Log:
Import glibc-ports-mainline for 2009-11-07
Modified:
fsf/trunk/ports/ChangeLog.arm
fsf/trunk/ports/ChangeLog.mips
fsf/trunk/ports/sysdeps/arm/memcpy.S
fsf/trunk/ports/sysdeps/arm/memmove.S
fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/clone.S
fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Sat Nov 7 00:04:47 2009
@@ -1,3 +1,15 @@
+2009-11-06 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/bits/fcntl.h (fallocate): Fix types
+ of last two arguments when -D_FILE_OFFSET_BITS=64.
+
+2009-11-04 Philip Blundell <philb@xxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/clone.S: Support V4T interworking.
+ * sysdeps/unix/sysv/linux/arm/sysdep.h (__local_syscall_error): Likewise.
+ * sysdeps/arm/memcpy.S: Likewise.
+ * sysdeps/arm/memmove.S: Likewise.
+
2009-10-29 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Define F_OWNER_* and
Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Sat Nov 7 00:04:47 2009
@@ -1,3 +1,8 @@
+2009-11-06 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (fallocate): Fix types
+ of last two arguments when -D_FILE_OFFSET_BITS=64.
+
2009-10-29 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Define F_OWNER_* and
Modified: fsf/trunk/ports/sysdeps/arm/memcpy.S
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/memcpy.S (original)
+++ fsf/trunk/ports/sysdeps/arm/memcpy.S Sat Nov 7 00:04:47 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by MontaVista Software, Inc. (written by Nicolas Pitre)
@@ -130,7 +130,12 @@
strcsb r4, [r0], #1
strcsb ip, [r0]
+#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
+ ldmfd sp!, {r0, r4, lr}
+ bx lr
+#else
ldmfd sp!, {r0, r4, pc}
+#endif
9: rsb ip, ip, #4
cmp ip, #2
Modified: fsf/trunk/ports/sysdeps/arm/memmove.S
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/memmove.S (original)
+++ fsf/trunk/ports/sysdeps/arm/memmove.S Sat Nov 7 00:04:47 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by MontaVista Software, Inc. (written by Nicolas Pitre)
@@ -144,7 +144,12 @@
strneb r3, [r0, #-1]!
strcsb r4, [r0, #-1]!
strcsb ip, [r0, #-1]
+#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
+ ldmfd sp!, {r0, r4, lr}
+ bx lr
+#else
ldmfd sp!, {r0, r4, pc}
+#endif
9: cmp ip, #2
ldrgtb r3, [r1, #-1]!
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h Sat Nov 7 00:04:47 2009
@@ -259,8 +259,8 @@
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/clone.S
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/clone.S (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/clone.S Sat Nov 7 00:04:47 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2005, 2008
+/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2005, 2008, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Pat Beirne <patb@xxxxxxxxxxxxxxxxx>
@@ -96,8 +96,14 @@
#endif
@ pick the function arg and call address off the stack and execute
ldr r0, [sp, #4]
+#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
+ ldr ip, [sp], #8
+ mov lr, pc
+ bx ip
+#else
mov lr, pc
ldr pc, [sp], #8
+#endif
@ and we are done, passing the return value through r0
b PLTJMP(HIDDEN_JUMPTARGET(_exit))
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h Sat Nov 7 00:04:47 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 93, 1995-2000, 2002, 2003, 2005, 2006
+/* Copyright (C) 1992, 93, 1995-2000, 2002, 2003, 2005, 2006, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@xxxxxxxxxxxxxx>, August 1995.
@@ -129,6 +129,11 @@
DO_RET(lr); \
1: .word C_SYMBOL_NAME(rtld_errno) - 0b - 8;
# else
+#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
+#define POP_PC ldr lr, [sp], #4; bx lr
+#else
+#define POP_PC ldr pc, [sp], #4
+#endif
# define SYSCALL_ERROR_HANDLER \
__local_syscall_error: \
str lr, [sp, #-4]!; \
@@ -138,7 +143,7 @@
rsb r1, r1, #0; \
str r1, [r0]; \
mvn r0, #0; \
- ldr pc, [sp], #4;
+ POP_PC;
# endif
#else
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h Sat Nov 7 00:04:47 2009
@@ -272,8 +272,8 @@
extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len);
# else
# ifdef __REDIRECT
-extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset,
- __off_t __len),
+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset,
+ __off64_t __len),
fallocate64);
# else
# define fallocate fallocate64