r1704 - glibc-package/branches/glibc-2.4/debian/patches/arm
Author: aurel32
Date: 2006-08-06 19:48:35 +0000 (Sun, 06 Aug 2006)
New Revision: 1704
Modified:
glibc-package/branches/glibc-2.4/debian/patches/arm/cvs-portshead.patch
Log:
Update arm port from cvs head.
Modified: glibc-package/branches/glibc-2.4/debian/patches/arm/cvs-portshead.patch
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/arm/cvs-portshead.patch 2006-08-06 19:40:33 UTC (rev 1703)
+++ glibc-package/branches/glibc-2.4/debian/patches/arm/cvs-portshead.patch 2006-08-06 19:48:35 UTC (rev 1704)
@@ -1,7 +1,6 @@
-Index: glibc-2.4/ports/ChangeLog.arm
-===================================================================
---- glibc-2.4.orig/ports/ChangeLog.arm 2006-08-05 13:24:21.000000000 -0400
-+++ glibc-2.4/ports/ChangeLog.arm 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/ChangeLog.arm glibc-2.4/ports/ChangeLog.arm
+--- glibc-2.4/ports/ChangeLog.arm 2006-03-02 16:23:41.000000000 +0100
++++ glibc-2.4/ports/ChangeLog.arm 2006-08-06 09:40:19.000000000 +0200
@@ -1,3 +1,83 @@
+2006-08-04 Daniel Jacobowitz <dan@codesourcery.com>
+
@@ -86,10 +85,9 @@
2006-03-02 Daniel Jacobowitz <dan@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h
-Index: glibc-2.4/ports/sysdeps/arm/dl-machine.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/arm/dl-machine.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/arm/dl-machine.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/arm/dl-machine.h glibc-2.4/ports/sysdeps/arm/dl-machine.h
+--- glibc-2.4/ports/sysdeps/arm/dl-machine.h 2006-08-06 17:29:36.000000000 +0200
++++ glibc-2.4/ports/sysdeps/arm/dl-machine.h 2006-08-06 09:40:19.000000000 +0200
@@ -46,13 +46,19 @@
@@ -114,10 +112,9 @@
}
-Index: glibc-2.4/ports/sysdeps/arm/initfini.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.4/ports/sysdeps/arm/initfini.c 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/arm/initfini.c glibc-2.4/ports/sysdeps/arm/initfini.c
+--- glibc-2.4/ports/sysdeps/arm/initfini.c 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.4/ports/sysdeps/arm/initfini.c 2006-05-30 17:31:04.000000000 +0200
@@ -0,0 +1,42 @@
+/* Special .init and .fini section support. ARM version.
+ Copyright (C) 2006 Free Software Foundation, Inc.
@@ -161,10 +158,9 @@
+static void call_gmon_start (void) __attribute__((noinline));
+
+#include <sysdeps/generic/initfini.c>
-Index: glibc-2.4/ports/sysdeps/arm/nptl/pthreaddef.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/arm/nptl/pthreaddef.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/arm/nptl/pthreaddef.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/arm/nptl/pthreaddef.h glibc-2.4/ports/sysdeps/arm/nptl/pthreaddef.h
+--- glibc-2.4/ports/sysdeps/arm/nptl/pthreaddef.h 2005-11-16 20:03:42.000000000 +0100
++++ glibc-2.4/ports/sysdeps/arm/nptl/pthreaddef.h 2006-08-06 09:40:19.000000000 +0200
@@ -30,8 +30,16 @@
#define TCB_ALIGNMENT 16
@@ -184,10 +180,9 @@
/* XXX Until we have a better place keep the definitions here. */
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h 2004-08-23 09:28:44.000000000 +0200
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h 2006-08-06 09:40:20.000000000 +0200
@@ -1,5 +1,5 @@
/* O_*, F_*, FD_* bit values for Linux.
- Copyright (C) 1995-1998, 2000, 2004 Free Software Foundation, Inc.
@@ -338,10 +333,9 @@
+#endif
+
__END_DECLS
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h 2005-10-31 21:41:32.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/bits/mman.h 2006-05-05 16:17:13.000000000 +0200
@@ -1,5 +1,5 @@
/* Definitions for POSIX memory map interface. Linux/ARM version.
- Copyright (C) 1997, 2000, 2003, 2005 Free Software Foundation, Inc.
@@ -368,10 +362,9 @@
#endif
/* The POSIX people had to invent similar names for the same things. */
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h 2005-11-16 19:08:53.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/linuxthreads/sysdep-cancel.h 2006-03-21 21:54:56.000000000 +0100
@@ -53,9 +53,9 @@
UNDOARGS_##args; \
cmn r0, $4096;
@@ -396,10 +389,9 @@
# ifdef IS_IN_libpthread
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h 2005-11-16 20:03:42.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h 2006-03-21 21:54:56.000000000 +0100
@@ -64,9 +64,9 @@
UNDOARGS_##args; \
cmn r0, $4096;
@@ -424,10 +416,9 @@
# ifdef IS_IN_libpthread
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/socket.S
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/socket.S 2006-08-05 13:24:22.000000000 -0400
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/socket.S glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/socket.S
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/socket.S 2005-11-16 20:03:42.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/socket.S 1970-01-01 01:00:00.000000000 +0100
@@ -1,131 +0,0 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 2003, 2005
- Free Software Foundation, Inc.
@@ -560,10 +551,9 @@
-#ifndef NO_WEAK_ALIAS
-weak_alias (__socket, socket)
-#endif
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/syscalls.list
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/syscalls.list 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/syscalls.list glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/syscalls.list
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/syscalls.list 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/syscalls.list 2006-03-21 21:54:56.000000000 +0100
@@ -0,0 +1,34 @@
+# File name Caller Syscall name # args Strong name Weak names
+
@@ -599,10 +589,9 @@
+shutdown - shutdown i:ii __shutdown shutdown
+socket - socket i:iii __socket socket
+socketpair - socketpair i:iiif __socketpair socketpair
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h 2006-08-05 13:24:22.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h 2005-11-16 20:03:42.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/sysdep.h 2006-03-21 21:54:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005
+/* Copyright (C) 2005, 2006
@@ -622,10 +611,9 @@
/* The ARM EABI user interface passes the syscall number in r7, instead
of in the swi. This is more efficient, because the kernel does not need
to fetch the swi from memory to find out the number; which can be painful
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/umount.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/umount.c 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/umount.c glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/umount.c
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/umount.c 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/eabi/umount.c 2006-03-21 21:54:56.000000000 +0100
@@ -0,0 +1,31 @@
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -658,10 +646,10 @@
+}
+
+weak_alias (__umount, umount);
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h 2006-08-06 09:40:20.000000000 +0200
@@ -0,0 +1,49 @@
+/* Set flags signalling availability of kernel features based on given
+ kernel version number.
@@ -712,10 +700,9 @@
+#endif
+
+#include_next <kernel-features.h>
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2006-02-27 10:36:06.000000000 -0500
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2006-02-27 16:36:06.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2006-08-06 09:40:20.000000000 +0200
@@ -31,6 +31,9 @@
#define FUTEX_CMP_REQUEUE 4
#define FUTEX_WAKE_OP 5
@@ -726,10 +713,9 @@
/* Initializer for compatibility lock. */
#define LLL_MUTEX_LOCK_INITIALIZER (0)
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sigaction.c
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/sigaction.c 2005-11-16 14:03:42.000000000 -0500
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sigaction.c 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sigaction.c glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sigaction.c
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sigaction.c 2005-11-16 20:03:42.000000000 +0100
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sigaction.c 2006-08-06 09:40:20.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2005
+/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2005, 2006
@@ -747,10 +733,9 @@
#ifndef LIBC_SIGACTION
weak_alias (__libc_sigaction, __sigaction)
libc_hidden_weak (__sigaction)
-Index: glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
-===================================================================
---- glibc-2.4.orig/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h 2001-07-06 00:56:13.000000000 -0400
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h 2006-08-05 13:25:14.000000000 -0400
+diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
+--- glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h 2001-07-06 06:56:13.000000000 +0200
++++ glibc-2.4/ports/sysdeps/unix/sysv/linux/arm/sys/ucontext.h 2006-08-06 09:40:20.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001, 2006 Free Software Foundation, Inc.
Reply to: