Author: aurel32
Date: 2007-04-12 09:38:04 +0000 (Thu, 12 Apr 2007)
New Revision: 2044
Added:
glibc-package/trunk/debian/patches/alpha/cvs-sigsuspend.diff
Removed:
glibc-package/trunk/debian/patches/alpha/submitted-sigsuspend.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Replace patches/alpha/submitted-sigsuspend.diff by
patches/alpha/cvs-sigsuspend.diff from upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-12 09:32:02 UTC (rev
2043)
+++ glibc-package/trunk/debian/changelog 2007-04-12 09:38:04 UTC (rev
2044)
@@ -15,9 +15,11 @@
#418720.
* Update Russian debconf translation, by Yuri Kozlov. Closes: #418748.
* Update Czech debconf translation, by Miroslav Kure. Closes: #418767.
- * debian/locales-depver: remove exp from the locales version.
+ * debian/locales-depver: remove exp from the locales version.
+ * Replace patches/alpha/submitted-sigsuspend.diff by
+ patches/alpha/cvs-sigsuspend.diff from upstream.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 12 Apr 2007 11:31:07 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 12 Apr 2007 11:37:26 +0200
glibc (2.5-1) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/alpha/cvs-sigsuspend.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/cvs-sigsuspend.diff
2007-04-12 09:32:02 UTC (rev 2043)
+++ glibc-package/trunk/debian/patches/alpha/cvs-sigsuspend.diff
2007-04-12 09:38:04 UTC (rev 2044)
@@ -0,0 +1,32 @@
+2007-03-13 Richard Henderson <[EMAIL PROTECTED]>
+
+ * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Add support for
+ __sigsuspend_nocancel.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/alpha/sigsuspend.S,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- libc/sysdeps/unix/sysv/linux/alpha/sigsuspend.S 2005/05/26 14:30:46
1.13
++++ libc/sysdeps/unix/sysv/linux/alpha/sigsuspend.S 2007/03/13 16:05:44
1.14
+@@ -20,6 +20,19 @@
+ /* sigsuspend is a special syscall since it needs to dereference the
+ sigset. This will have to change when we have more than 64 signals. */
+
++#ifndef NO_CANCELLATION
++#include <sysdep.h>
++
++#undef PSEUDO_PREPARE_ARGS
++#define PSEUDO_PREPARE_ARGS ldq a0, 0(a0);
++
++PSEUDO(__sigsuspend_nocancel, sigsuspend, 1)
++ ret
++/* Use END, not PSEUDO_END, so that we don't issue two $syscall_error
++ symbols; we'll jump into __sigsuspend for the error case. */
++END(__sigsuspend_nocancel)
++#endif /* NO_CANCELLATION */
++
+ #include <sysdep-cancel.h>
+
+ #undef PSEUDO_PREPARE_ARGS
Deleted: glibc-package/trunk/debian/patches/alpha/submitted-sigsuspend.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/submitted-sigsuspend.diff
2007-04-12 09:32:02 UTC (rev 2043)
+++ glibc-package/trunk/debian/patches/alpha/submitted-sigsuspend.diff
2007-04-12 09:38:04 UTC (rev 2044)
@@ -1,27 +0,0 @@
-This page fix the build of the glibc on alpha. It has been submitted
-on libc-alpha by Jakub Jelinek <[EMAIL PROTECTED]>.
-
---- glibc-2.5/sysdeps/unix/sysv/linux/alpha/sigsuspend.S.orig 2006-10-22
22:17:01.000000000 +0200
-+++ glibc-2.5/sysdeps/unix/sysv/linux/alpha/sigsuspend.S 2006-10-22
22:18:05.000000000 +0200
-@@ -31,3 +31,21 @@
- libc_hidden_def (__sigsuspend)
- weak_alias (__sigsuspend, sigsuspend)
- strong_alias (__sigsuspend, __libc_sigsuspend)
-+
-+#ifndef NO_CANCELLATION
-+ .globl __sigsuspend_nocancel;
-+ .align 4;
-+ .type __sigsuspend_nocancel, @function;
-+ .usepv __sigsuspend_nocancel, std;
-+ cfi_startproc;
-+__LABEL(__sigsuspend_nocancel)
-+ ldgp gp, 0(pv);
-+ PSEUDO_PROF;
-+ PSEUDO_PREPARE_ARGS
-+ lda v0, SYS_ify(sigsuspend);
-+ call_pal PAL_callsys;
-+ bne a3, SYSCALL_ERROR_LABEL;
-+ ret;
-+ cfi_endproc;
-+ .size __sigsuspend_nocancel, .-__sigsuspend_nocancel
-+#endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-04-12 09:32:02 UTC (rev
2043)
+++ glibc-package/trunk/debian/patches/series 2007-04-12 09:38:04 UTC (rev
2044)
@@ -38,8 +38,8 @@
localedata/local-all-no-archive.diff -p0
#alpha/submitted-pic.diff -p0 # g: suspended
+alpha/cvs-sigsuspend.diff -p1
alpha/local-gcc4.1.diff -p0
-alpha/submitted-sigsuspend.diff -p1
alpha/submitted-xstat.diff -p0
amd64/local-biarch.diff -p1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
