r1208 - in glibc-package/trunk/debian: . control.in patches sysdeps
Author: aurel32
Date: 2006-02-22 10:56:43 +0000 (Wed, 22 Feb 2006)
New Revision: 1208
Added:
glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/sysdeps/hppa.mk
Log:
* Add hppa-cdisable-ret0.diff (restore ret0 across calls to CDISABLE)
from Randolph Chung. (Closes: #326581)
* Switch to gcc-4.0 on hppa.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-22 07:54:47 UTC (rev 1207)
+++ glibc-package/trunk/debian/changelog 2006-02-22 10:56:43 UTC (rev 1208)
@@ -79,6 +79,9 @@
* 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)
+ from Randolph Chung. (Closes: #326581)
+ * Switch to gcc-4.0 on hppa.
-- Clint Adams <schizo@debian.org> Sun, 12 Feb 2006 11:04:38 -0500
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-02-22 07:54:47 UTC (rev 1207)
+++ glibc-package/trunk/debian/control 2006-02-22 10:56:43 UTC (rev 1208)
@@ -6,7 +6,7 @@
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386],
- gcc-4.0 [!m68k !hppa !hurd-i386], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [!m68k !hurd-i386], gcc-3.4 [m68k], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc],
quilt
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-02-22 07:54:47 UTC (rev 1207)
+++ glibc-package/trunk/debian/control.in/main 2006-02-22 10:56:43 UTC (rev 1208)
@@ -6,7 +6,7 @@
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386],
- gcc-4.0 [!m68k !hppa !hurd-i386], gcc-3.4 [m68k hppa], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [!m68k !hurd-i386], gcc-3.4 [m68k], gcc-3.3 [hurd-i386], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc],
quilt
Added: glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff 2006-02-22 07:54:47 UTC (rev 1207)
+++ glibc-package/trunk/debian/patches/hppa-cdisable-ret0.diff 2006-02-22 10:56:43 UTC (rev 1208)
@@ -0,0 +1,31 @@
+2005-06-26 Randolph Chung <tausq@debian.org>
+
+ * 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 07:54:47 UTC (rev 1207)
+++ glibc-package/trunk/debian/patches/series 2006-02-22 10:56:43 UTC (rev 1208)
@@ -126,3 +126,4 @@
glibc-manual-memory.diff -p1
hurd-ioctl-decode-argument.diff -p0
glibc-manual-string.diff -p1
+hppa-cdisable-ret0.diff -p1
Modified: glibc-package/trunk/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hppa.mk 2006-02-22 07:54:47 UTC (rev 1207)
+++ glibc-package/trunk/debian/sysdeps/hppa.mk 2006-02-22 10:56:43 UTC (rev 1208)
@@ -1,8 +1,3 @@
-# HPPA doesn't work when built with gcc 4.0, as of 2005-11-12.
-# See bug #326581.
-BUILD_CC = gcc-3.4
-CC = gcc-3.4
-
# hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
# (See: Bug#239020) In future we may drop this file with supporting hppa64.
Reply to: