r4439 - in glibc-package/trunk/debian: . patches patches/arm
Author: aurel32
Date: 2010-10-30 16:16:20 +0000 (Sat, 30 Oct 2010)
New Revision: 4439
Added:
glibc-package/trunk/debian/patches/arm/local-sigaction.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add arm/local-sigaction.diff to match sigaction with SA_RESTORER
behaviour with other architectures. Closes: #595403.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-10-30 09:17:07 UTC (rev 4438)
+++ glibc-package/trunk/debian/changelog 2010-10-30 16:16:20 UTC (rev 4439)
@@ -13,8 +13,10 @@
* Update Catalan debconf translation, by Jordi Mallach. Closes: #601085.
* Update Vietnamese debconf translation, by Clytie Siddall. Closes:
#601531.
+ * Add arm/local-sigaction.diff to match sigaction with SA_RESTORER
+ behaviour with other architectures. Closes: #595403.
- -- Aurelien Jarno <aurel32@debian.org> Sat, 30 Oct 2010 11:15:18 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 30 Oct 2010 18:12:49 +0200
eglibc (2.11.2-6) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/arm/local-sigaction.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/local-sigaction.diff (rev 0)
+++ glibc-package/trunk/debian/patches/arm/local-sigaction.diff 2010-10-30 16:16:20 UTC (rev 4439)
@@ -0,0 +1,36 @@
+diff --git a/sysdeps/unix/sysv/linux/arm/sigaction.c b/sysdeps/unix/sysv/linux/arm/sigaction.c
+index 707c0fa..10375c1 100644
+--- a/sysdeps/unix/sysv/linux/arm/sigaction.c
++++ b/sysdeps/unix/sysv/linux/arm/sigaction.c
+@@ -98,13 +98,8 @@ __libc_sigaction (sig, act, oact)
+ memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
+ kact.sa_flags = act->sa_flags;
+ # ifdef HAVE_SA_RESTORER
+- if (kact.sa_flags & SA_RESTORER)
+- kact.sa_restorer = act->sa_restorer;
+- else
+- {
+- kact.sa_restorer = choose_restorer (kact.sa_flags);
+- kact.sa_flags |= SA_RESTORER;
+- }
++ kact.sa_restorer = choose_restorer (kact.sa_flags);
++ kact.sa_flags |= SA_RESTORER;
+ # endif
+ }
+
+@@ -144,13 +139,8 @@ __libc_sigaction (sig, act, oact)
+ k_sigact.sa_mask = act->sa_mask.__val[0];
+ k_sigact.sa_flags = act->sa_flags;
+ # ifdef HAVE_SA_RESTORER
+- if (k_sigact.sa_flags & SA_RESTORER)
+- k_sigact.sa_restorer = act->sa_restorer;
+- else
+- {
+- k_sigact.sa_restorer = choose_restorer (k_sigact.sa_flags);
+- k_sigact.sa_flags |= SA_RESTORER;
+- }
++ k_sigact.sa_restorer = choose_restorer (k_sigact.sa_flags);
++ k_sigact.sa_flags |= SA_RESTORER;
+ # endif
+ }
+ result = INLINE_SYSCALL (sigaction, 3, sig,
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-10-30 09:17:07 UTC (rev 4438)
+++ glibc-package/trunk/debian/patches/series 2010-10-30 16:16:20 UTC (rev 4439)
@@ -71,6 +71,7 @@
arm/local-lowlevellock.diff
arm/local-no-hwcap.diff
arm/local-hwcap-updates.diff
+arm/local-sigaction.diff
hppa/local-inlining.diff
hppa/local-linuxthreads.diff
Reply to: