This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] sparc: fix sigaction for 32bit builds [BZ #18694]
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Cc: davem at davemloft dot net
- Date: Mon, 20 Jul 2015 07:34:15 -0400
- Subject: [PATCH] sparc: fix sigaction for 32bit builds [BZ #18694]
- Authentication-results: sourceware.org; auth=none
Commit a059d359d86130b5fa74e04a978c8523a0293f77 changed the sigaction
struct to pass conform tests, but it ended up also changing the ABI for
32 bit builds. For 64 bit builds, changing the long to two ints works,
but for 32 bit builds, it inserts 4 extra bytes. This leads to many
packages randomly failing like bash that spews things like:
configure: line 471: wait_for: No record of process 0
Bracket the new member by a wordsize check to fix the ABI for 32bit.
---
ChangeLog | 7 +++++++
NEWS | 2 +-
sysdeps/unix/sysv/linux/sparc/bits/sigaction.h | 4 ++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 1265017..d039dbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-20 Mike Frysinger <vapier@gentoo.org>
+
+ [BZ #18694]
+ * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Include
+ bits/wordsize.h.
+ (sigaction): Declare __glibc_reserved0 only when __WORDSIZE is 64.
+
2015-07-16 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/fpu/libm-test-ulps: Regenerated.
diff --git a/NEWS b/NEWS
index fc84560..d60e3c7 100644
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,7 @@ Version 2.22
18522, 18527, 18528, 18529, 18530, 18532, 18533, 18534, 18536, 18539,
18540, 18542, 18544, 18545, 18546, 18547, 18549, 18553, 18557, 18558,
18569, 18583, 18585, 18586, 18592, 18593, 18594, 18602, 18612, 18613,
- 18619, 18633, 18641, 18643, 18648, 18676.
+ 18619, 18633, 18641, 18643, 18648, 18676, 18694.
* Cache information can be queried via sysconf() function on s390 e.g. with
_SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
index 0750b52..3af5541 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
@@ -20,6 +20,8 @@
# error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
#endif
+#include <bits/wordsize.h>
+
/* Structure describing the action to be taken when a signal arrives. */
struct sigaction
{
@@ -43,7 +45,9 @@ struct sigaction
__sigset_t sa_mask;
/* Special flags. */
+#if __WORDSIZE == 64
int __glibc_reserved0;
+#endif
int sa_flags;
/* Not used by Linux/Sparc yet. */
--
2.4.4