Author: aurel32
Date: 2006-02-22 16:12:19 +0000 (Wed, 22 Feb 2006)
New Revision: 1210
Removed:
glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/glibc235-hppa-lt.diff
glibc-package/trunk/debian/patches/series
Log:
hppa-cdisable-ret0.diff is actually a fix to glibc235-hppa-lt.diff...
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-22 14:08:31 UTC (rev
1209)
+++ glibc-package/trunk/debian/changelog 2006-02-22 16:12:19 UTC (rev
1210)
@@ -79,7 +79,7 @@
* Decrease priorities of 64-bit main and -dev packages to standard
and optional for all architectures. It better matches override,
though it will still have to be changed.
- * Add hppa-cdisable-ret0.diff (restore ret0 across calls to CDISABLE)
+ * Fix glibc235-hppa-lt.diff (restore ret0 across calls to CDISABLE)
from Randolph Chung. (Closes: #326581)
* Switch to gcc-4.0 on hppa.
Modified: glibc-package/trunk/debian/patches/glibc235-hppa-lt.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-hppa-lt.diff 2006-02-22
14:08:31 UTC (rev 1209)
+++ glibc-package/trunk/debian/patches/glibc235-hppa-lt.diff 2006-02-22
16:12:19 UTC (rev 1210)
@@ -855,14 +855,14 @@
+ ldw -24(%sp), %r26 ASM_LINE_SEP \
+ CDISABLE ASM_LINE_SEP \
+ stw %ret0, -24(%sp) /* delay */ ASM_LINE_SEP \
-+ /* Restore syscall return (use arg regs) */ ASM_LINE_SEP \
-+ ldw -24(%sp), %r26 ASM_LINE_SEP \
++ /* Restore syscall return */ ASM_LINE_SEP \
++ ldw -24(%sp), %ret0 ASM_LINE_SEP \
+ /* compare error */ ASM_LINE_SEP \
+ ldi NO_ERROR,%r1 ASM_LINE_SEP \
+ /* branch if no error */ ASM_LINE_SEP \
-+ cmpb,>>=,n %r1,%r26,L(pre_end) ASM_LINE_SEP \
++ cmpb,>>=,n %r1,%ret0,L(pre_end) ASM_LINE_SEP \
+ LOAD_PIC(TREG) /* cond. nullify */ ASM_LINE_SEP \
-+ copy %r26, TREG /* save syscall return */ ASM_LINE_SEP \
++ copy %ret0, TREG /* save syscall return */ ASM_LINE_SEP \
+ SYSCALL_ERROR_HANDLER ASM_LINE_SEP \
+ /* make syscall res value positive */ ASM_LINE_SEP \
+ sub %r0, TREG, TREG /* delay */ ASM_LINE_SEP \
Deleted: glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff 2006-02-22
14:08:31 UTC (rev 1209)
+++ glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff 2006-02-22
16:12:19 UTC (rev 1210)
@@ -1,31 +0,0 @@
-2005-06-26 Randolph Chung <[EMAIL PROTECTED]>
-
- * sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h: Restore ret0
- across calls to CDISABLE
-
-===================================================================
-RCS file:
/var/lib/cvs/glibc/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- glibc/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h
2005/06/09 04:33:15 1.3
-+++ glibc/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h
2005/06/26 00:46:36 1.4
-@@ -111,14 +111,14 @@
- ldw -24(%sp), %r26 ASM_LINE_SEP \
- CDISABLE ASM_LINE_SEP \
- stw %ret0, -24(%sp) /* delay */ ASM_LINE_SEP \
-- /* Restore syscall return (use arg regs) */ ASM_LINE_SEP \
-- ldw -24(%sp), %r26 ASM_LINE_SEP \
-+ /* Restore syscall return */ ASM_LINE_SEP \
-+ ldw -24(%sp), %ret0 ASM_LINE_SEP \
- /* compare error */ ASM_LINE_SEP \
- ldi NO_ERROR,%r1 ASM_LINE_SEP \
- /* branch if no error */ ASM_LINE_SEP \
-- cmpb,>>=,n %r1,%r26,L(pre_end) ASM_LINE_SEP \
-+ cmpb,>>=,n %r1,%ret0,L(pre_end) ASM_LINE_SEP \
- LOAD_PIC(TREG) /* cond. nullify */ ASM_LINE_SEP \
-- copy %r26, TREG /* save syscall return */ ASM_LINE_SEP \
-+ copy %ret0, TREG /* save syscall return */ ASM_LINE_SEP \
- SYSCALL_ERROR_HANDLER ASM_LINE_SEP \
- /* make syscall res value positive */ ASM_LINE_SEP \
- sub %r0, TREG, TREG /* delay */ ASM_LINE_SEP \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-02-22 14:08:31 UTC (rev
1209)
+++ glibc-package/trunk/debian/patches/series 2006-02-22 16:12:19 UTC (rev
1210)
@@ -126,4 +126,3 @@
glibc-manual-memory.diff -p1
hurd-ioctl-decode-argument.diff -p0
glibc-manual-string.diff -p1
-hppa-cdisable-ret0.diff -p1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
