r1558 - in glibc-package/branches/glibc-2.4/debian: . patches patches/hppa
Author: aurel32
Date: 2006-05-28 15:01:08 +0000 (Sun, 28 May 2006)
New Revision: 1558
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/hppa/local-gcc-4-profile.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-drop-utimes.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-iitlbp.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-sysdeps.diff
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Update hppa/local-gcc-4-profile.diff to reflect the new port add-on.
* Update hppa/submitted-drop-utimes.diff.
* Update hppa/submitted-fpu.diff to reflect the new port add-on.
* Update hppa/submitted-iitlbp.diff to reflect the new port add-on.
* Update hppa/submitted-sysdeps.diff.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 15:01:08 UTC (rev 1558)
@@ -71,8 +71,13 @@
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/cvs-no-ldbl-128.diff to reflect the new port add-on.
* Update hppa/cvs-pie-relocs.diff to reflect the new port add-on.
+ * Update hppa/local-gcc-4-profile.diff to reflect the new port add-on.
* Update hppa/local-inlining.diff to reflect the new port add-on.
+ * Update hppa/submitted-drop-utimes.diff.
* Update hppa/submitted-fenv-align.diff to reflect the new port add-on.
+ * Update hppa/submitted-fpu.diff to reflect the new port add-on.
+ * Update hppa/submitted-iitlbp.diff to reflect the new port add-on.
+ * Update hppa/submitted-sysdeps.diff.
* Remove hurd-i386/cvs-ioctl-pfinet.diff (merged upstream).
* Remove hurd-i386/cvs-getresuid-dyslexia.diff (merged upstream).
* Remove hurd-i386/cvs-posix-opts.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/local-gcc-4-profile.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/local-gcc-4-profile.diff 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/local-gcc-4-profile.diff 2006-05-28 15:01:08 UTC (rev 1558)
@@ -11,8 +11,8 @@
* sysdeps/hppa/dl-machine.h: Remove strong_alias.
---- sysdeps/hppa/dl-machine.h.gotom 2005-08-04 23:43:40.000000000 +0900
-+++ sysdeps/hppa/dl-machine.h 2005-08-04 23:47:35.000000000 +0900
+--- ports/sysdeps/hppa/dl-machine.h.gotom 2005-08-04 23:43:40.000000000 +0900
++++ ports/sysdeps/hppa/dl-machine.h 2005-08-04 23:47:35.000000000 +0900
@@ -538,8 +538,7 @@
TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup);
#else
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-drop-utimes.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-drop-utimes.diff 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-drop-utimes.diff 2006-05-28 15:01:08 UTC (rev 1558)
@@ -22,10 +22,10 @@
diff -u -r1.81 kernel-features.h
--- glibc-20041227/sysdeps/unix/sysv/linux/kernel-features.h 24 Nov 2004 04:36:11 -0000 1.81
+++ glibc-20041227/sysdeps/unix/sysv/linux/kernel-features.h 2 Jan 2005 12:19:13 -0000
-@@ -361,7 +361,7 @@
+@@ -359,7 +359,7 @@
/* The utimes syscall has been available for some architectures
- forever. For x86 it was introduced after 2.5.75, for x86-64 in
- 2.6.0-test3. */
+ forever. For x86 it was introduced after 2.5.75, for x86-64,
+ ppc, and ppc64 it was introduced in 2.6.0-test3. */
-#if defined __alpha__ || defined __ia64__ || defined __hppa__ \
+#if defined __alpha__ || defined __ia64__ \
|| defined __sparc__ \
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-fpu.diff 2006-05-28 15:01:08 UTC (rev 1558)
@@ -6,9 +6,9 @@
# DP: Status Details: to be merged by Carlos
# DP: Date: Sun, 15 Jan 2006
-diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/fegetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c
---- glibc-2.3.5/sysdeps/hppa/fpu.orig/fegetenv.c 2006-01-14 10:17:19.000000000 -0800
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fegetenv.c 2006-01-14 10:19:08.000000000 -0800
+diff -uNr ports/sysdeps/hppa/fpu.orig/fegetenv.c ports/sysdeps/hppa/fpu/fegetenv.c
+--- ports/sysdeps/hppa/fpu.orig/fegetenv.c 2006-01-14 10:17:19.000000000 -0800
++++ ports/sysdeps/hppa/fpu/fegetenv.c 2006-01-14 10:19:08.000000000 -0800
@@ -27,10 +27,7 @@
unsigned long long buf[4], *bufptr = buf;
@@ -21,9 +21,9 @@
: "=m" (buf), "+r" (bufptr));
memcpy (envp, buf, sizeof (*envp));
return 0;
-diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/feholdexcpt.c glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c
---- glibc-2.3.5/sysdeps/hppa/fpu.orig/feholdexcpt.c 2006-01-14 10:17:19.000000000 -0800
-+++ glibc-2.3.5/sysdeps/hppa/fpu/feholdexcpt.c 2006-01-14 10:20:21.000000000 -0800
+diff -uNr ports/sysdeps/hppa/fpu.orig/feholdexcpt.c ports/sysdeps/hppa/fpu/feholdexcpt.c
+--- ports/sysdeps/hppa/fpu.orig/feholdexcpt.c 2006-01-14 10:17:19.000000000 -0800
++++ ports/sysdeps/hppa/fpu/feholdexcpt.c 2006-01-14 10:20:21.000000000 -0800
@@ -30,10 +30,7 @@
/* Store the environment. */
bufptr = clear.buf;
@@ -48,9 +48,9 @@
: : "r" (bufptr), "m" (clear));
return 0;
-diff -uNr glibc-2.3.5/sysdeps/hppa/fpu.orig/fesetenv.c glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c
---- glibc-2.3.5/sysdeps/hppa/fpu.orig/fesetenv.c 2006-01-14 10:17:19.000000000 -0800
-+++ glibc-2.3.5/sysdeps/hppa/fpu/fesetenv.c 2006-01-14 10:20:44.000000000 -0800
+diff -uNr ports/sysdeps/hppa/fpu.orig/fesetenv.c ports/sysdeps/hppa/fpu/fesetenv.c
+--- ports/sysdeps/hppa/fpu.orig/fesetenv.c 2006-01-14 10:17:19.000000000 -0800
++++ ports/sysdeps/hppa/fpu/fesetenv.c 2006-01-14 10:20:44.000000000 -0800
@@ -34,10 +34,7 @@
we want to use from the environment specified by the parameter. */
bufptr = temp.buf;
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-iitlbp.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-iitlbp.diff 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-iitlbp.diff 2006-05-28 15:01:08 UTC (rev 1558)
@@ -5,26 +5,26 @@
# DP: Upstream status: Not submitted
# DP: Date: 2005-10-14
-Index: libc/sysdeps/hppa/abort-instr.h
+Index: ports/sysdeps/hppa/abort-instr.h
===================================================================
-RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/hppa/abort-instr.h,v
+RCS file: /big/fsf/rsync/gports-cvs/ports/sysdeps/hppa/abort-instr.h,v
retrieving revision 1.1
diff -u -p -r1.1 abort-instr.h
---- libc/sysdeps/hppa/abort-instr.h 23 Sep 2002 03:30:34 -0000 1.1
-+++ libc/sysdeps/hppa/abort-instr.h 14 Oct 2005 14:25:52 -0000
+--- ports/sysdeps/hppa/abort-instr.h 23 Sep 2002 03:30:34 -0000 1.1
++++ ports/sysdeps/hppa/abort-instr.h 14 Oct 2005 14:25:52 -0000
@@ -3,4 +3,4 @@
We go with iitlbp because it has a history of being used to crash
programs. */
-#define ABORT_INSTRUCTION asm ("iitlbp %r0,(%r0)")
+#define ABORT_INSTRUCTION asm ("iitlbp %r0,(%sr0,%r0)")
-Index: libc/sysdeps/hppa/dl-machine.h
+Index: ports/sysdeps/hppa/dl-machine.h
===================================================================
-RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/hppa/dl-machine.h,v
+RCS file: /big/fsf/rsync/gports-cvs/ports/sysdeps/hppa/dl-machine.h,v
retrieving revision 1.21
diff -u -p -r1.21 dl-machine.h
---- libc/sysdeps/hppa/dl-machine.h 19 Nov 2004 00:01:25 -0000 1.21
-+++ libc/sysdeps/hppa/dl-machine.h 14 Oct 2005 14:57:02 -0000
+--- ports/sysdeps/hppa/dl-machine.h 19 Nov 2004 00:01:25 -0000 1.21
++++ ports/sysdeps/hppa/dl-machine.h 14 Oct 2005 14:57:02 -0000
@@ -367,7 +367,7 @@ asm ( \
" ldw,ma 8(%r26),%r19\n" \
\
@@ -34,29 +34,13 @@
\
"2: ldw -4(%r26),%r19\n" /* Found it, load value. */ \
" add %r19,%r20,%r19\n" /* And add the load offset. */ \
-Index: libc/sysdeps/hppa/elf/start.S
+Index: ports/sysdeps/unix/sysv/linux/hppa/clone.S
===================================================================
-RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/hppa/elf/start.S,v
-retrieving revision 1.5
-diff -u -p -r1.5 start.S
---- libc/sysdeps/hppa/elf/start.S 16 Aug 2004 04:51:00 -0000 1.5
-+++ libc/sysdeps/hppa/elf/start.S 14 Oct 2005 14:26:33 -0000
-@@ -83,7 +83,7 @@ _start:
- bl __libc_start_main,%r2
- nop
- /* die horribly if it returned (it shouldn't) */
-- iitlbp %r0,(%r0)
-+ iitlbp %r0,(%sr0,%r0)
- nop
-
- .procend
-Index: libc/sysdeps/unix/sysv/linux/hppa/clone.S
-===================================================================
-RCS file: /big/fsf/rsync/glibc-cvs/libc/sysdeps/unix/sysv/linux/hppa/clone.S,v
+RCS file: /big/fsf/rsync/gports-cvs/ports/sysdeps/unix/sysv/linux/hppa/clone.S,v
retrieving revision 1.4
diff -u -p -r1.4 clone.S
---- libc/sysdeps/unix/sysv/linux/hppa/clone.S 18 Dec 2003 06:05:03 -0000 1.4
-+++ libc/sysdeps/unix/sysv/linux/hppa/clone.S 14 Oct 2005 14:40:59 -0000
+--- ports/sysdeps/unix/sysv/linux/hppa/clone.S 18 Dec 2003 06:05:03 -0000 1.4
++++ ports/sysdeps/unix/sysv/linux/hppa/clone.S 14 Oct 2005 14:40:59 -0000
@@ -92,7 +92,7 @@ thread_start:
copy %ret0,%arg0
Modified: glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-sysdeps.diff 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa/submitted-sysdeps.diff 2006-05-28 15:01:08 UTC (rev 1558)
@@ -7,8 +7,8 @@
# DP: Status Details:
# DP: Date: 2005-07-17
---- libc-orig/sysdeps/generic/dl-sysdep.c 2004-12-14 15:30:41.000000000 -0500
-+++ libc/sysdeps/generic/dl-sysdep.c 2004-12-14 15:30:29.000000000 -0500
+--- elf/dl-sysdep.c 2004-12-14 15:30:41.000000000 -0500
++++ elf/dl-sysdep.c 2004-12-14 15:30:29.000000000 -0500
@@ -89,7 +89,7 @@
#else
uid_t uid = 0;
@@ -18,8 +18,8 @@
# define set_seen_secure() (seen = -1)
# ifdef HAVE_AUX_XID
# define set_seen(tag) (tag) /* Evaluate for the side effects. */
---- libc-orig/sysdeps/hppa/atomicity.h 1969-12-31 19:00:00.000000000 -0500
-+++ libc/sysdeps/hppa/atomicity.h 2003-12-08 21:25:00.000000000 -0500
+--- ports/sysdeps/hppa/atomicity.h 1969-12-31 19:00:00.000000000 -0500
++++ ports/sysdeps/hppa/atomicity.h 2003-12-08 21:25:00.000000000 -0500
@@ -0,0 +1,55 @@
+/* Low-level functions for atomic operations. HP-PARISC version.
+ Copyright (C) 1997,2001 Free Software Foundation, Inc.
@@ -76,8 +76,8 @@
+}
+
+#endif /* atomicity.h */
---- libc-orig/sysdeps/hppa/bits/link.h 2005-01-28 14:39:49.000000000 -0500
-+++ libc/sysdeps/hppa/bits/link.h 2005-03-01 13:42:58.000000000 -0500
+--- ports/sysdeps/hppa/bits/link.h 2005-01-28 14:39:49.000000000 -0500
++++ ports/sysdeps/hppa/bits/link.h 2005-03-01 13:42:58.000000000 -0500
@@ -0,0 +1,63 @@
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -142,8 +142,8 @@
+ const char *symname);
+
+__END_DECLS
---- libc-orig/sysdeps/hppa/dl-trampoline.S 1969-12-31 19:00:00.000000000 -0500
-+++ libc/sysdeps/hppa/dl-trampoline.S 2005-04-05 15:51:55.000000000 -0400
+--- ports/sysdeps/hppa/dl-trampoline.S 1969-12-31 19:00:00.000000000 -0500
++++ ports/sysdeps/hppa/dl-trampoline.S 2005-04-05 15:51:55.000000000 -0400
@@ -0,0 +1,194 @@
+/* PLT trampolines. hppa version.
+ Copyright (C) 2005 Free Software Foundation, Inc.
@@ -339,8 +339,8 @@
+
+
+
---- libc-orig/sysdeps/hppa/fpu/libm-test-ulps 2003-03-22 19:52:10.000000000 -0500
-+++ libc/sysdeps/hppa/fpu/libm-test-ulps 2004-09-29 23:50:16.000000000 -0400
+--- ports/sysdeps/hppa/fpu/libm-test-ulps 2003-03-22 19:52:10.000000000 -0500
++++ ports/sysdeps/hppa/fpu/libm-test-ulps 2004-09-29 23:50:16.000000000 -0400
@@ -1,6 +1,9 @@
# Begin of automatic generation
@@ -395,8 +395,8 @@
Function: Imaginary part of "ctan":
double: 1
idouble: 1
---- libc-orig/sysdeps/hppa/sysdep.h 2003-10-15 01:31:42.000000000 -0400
-+++ libc/sysdeps/hppa/sysdep.h 2004-11-01 01:51:58.000000000 -0500
+--- ports/sysdeps/hppa/sysdep.h 2003-10-15 01:31:42.000000000 -0400
++++ ports/sysdeps/hppa/sysdep.h 2004-11-01 01:51:58.000000000 -0500
@@ -22,9 +22,8 @@
#include <sys/syscall.h>
#include "config.h"
@@ -425,8 +425,8 @@
#else
#define CALL_MCOUNT /* Do nothing. */
#endif
---- libc-orig/sysdeps/unix/sysv/linux/hppa/sysdep.c 2003-10-15 01:45:16.000000000 -0400
-+++ libc/sysdeps/unix/sysv/linux/hppa/sysdep.c 2004-09-20 14:04:24.000000000 -0400
+--- ports/sysdeps/unix/sysv/linux/hppa/sysdep.c 2003-10-15 01:45:16.000000000 -0400
++++ ports/sysdeps/unix/sysv/linux/hppa/sysdep.c 2004-09-20 14:04:24.000000000 -0400
@@ -46,13 +46,13 @@
{
register unsigned long int __res asm("r28");
@@ -444,8 +444,8 @@
__sys_res = __res;
}
if ((unsigned long int) __sys_res >= (unsigned long int) -4095)
---- libc-orig/sysdeps/unix/sysv/linux/hppa/sysdep.h 2003-11-03 12:18:38.000000000 -0500
-+++ libc/sysdeps/unix/sysv/linux/hppa/sysdep.h 2005-04-05 03:40:47.000000000 -0400
+--- ports/sysdeps/unix/sysv/linux/hppa/sysdep.h 2003-11-03 12:18:38.000000000 -0500
++++ ports/sysdeps/unix/sysv/linux/hppa/sysdep.h 2005-04-05 03:40:47.000000000 -0400
@@ -24,26 +24,33 @@
#include <sys/syscall.h>
#include "config.h"
@@ -890,8 +890,8 @@
/* Even with zero args we use r20 for the syscall number */
#define ASM_ARGS_0
---- libc-orig/sysdeps/unix/sysv/linux/posix_fadvise.c 2003-08-16 20:36:22.000000000 -0400
-+++ libc/sysdeps/unix/sysv/linux/posix_fadvise.c 2004-09-26 22:45:33.000000000 -0400
+--- sysdeps/unix/sysv/linux/posix_fadvise.c 2003-08-16 20:36:22.000000000 -0400
++++ sysdeps/unix/sysv/linux/posix_fadvise.c 2004-09-26 22:45:33.000000000 -0400
@@ -35,6 +35,19 @@
return INTERNAL_SYSCALL_ERRNO (ret, err);
return 0;
@@ -912,12 +912,13 @@
+# endif
#endif
}
---- glibc-2.3.5.old/sysdeps/hppa/dl-lookupcfg.h 2005-05-15 20:36:10.383193082 -0600
-+++ glibc-2.3.5/sysdeps/hppa/dl-lookupcfg.h 2005-05-15 21:44:07.543952666 -0600
-@@ -67,3 +69,15 @@
+--- ports/sysdeps/hppa/dl-lookupcfg.h 2005-05-15 20:36:10.383193082 -0600
++++ ports/sysdeps/hppa/dl-lookupcfg.h 2005-05-15 21:44:07.543952666 -0600
+@@ -63,3 +63,15 @@
+ ((Elf32_Addr)(addr) & 2 ? (addr) : DL_AUTO_FUNCTION_ADDRESS (map, addr))
#define DL_DT_FINI_ADDRESS(map, addr) \
((Elf32_Addr)(addr) & 2 ? (addr) : DL_AUTO_FUNCTION_ADDRESS (map, addr))
-
++
+/* The type of the return value of fixup/profile_fixup */
+#define DL_FIXUP_VALUE_TYPE struct fdesc
+
@@ -929,4 +930,3 @@
+#define DL_FIXUP_VALUE_CODE_ADDR(value) ((value).ip)
+#define DL_FIXUP_VALUE_ADDR(value) ((uintptr_t) &(value))
+#define DL_FIXUP_ADDR_VALUE(addr) (*(struct fdesc *) (addr))
-+
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 14:34:36 UTC (rev 1557)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 15:01:08 UTC (rev 1558)
@@ -55,14 +55,14 @@
#arm/local-no-hwcap.diff -p0
hppa/local-Rminkernel.diff -p0
-#hppa/submitted-drop-utimes.diff -p1
+hppa/submitted-drop-utimes.diff -p1
#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
hppa/submitted-lt.diff -p1
-#hppa/submitted-sysdeps.diff -p1
-#hppa/local-gcc-4-profile.diff -p0
-#hppa/submitted-iitlbp.diff -p1
+hppa/submitted-sysdeps.diff -p0
+hppa/local-gcc-4-profile.diff -p0
+hppa/submitted-iitlbp.diff -p0
hppa/submitted-fenv-align.diff -p0
-#hppa/submitted-fpu.diff -p1
+hppa/submitted-fpu.diff -p0
hppa/cvs-pie-relocs.diff -p0
hppa/cvs-no-ldbl-128.diff -p0
hppa/local-inlining.diff -p0
Reply to: