aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-01-02 16:19:48 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-01-02 18:53:50 -0200
commitcbce12d22b91a2393158ed7cb0a81bb26478dafd (patch)
treece301d1a1736362fcb373f3f671595502eee23b3
parente082ac7533e75d3dbe5b949b09e843a65348d43b (diff)
downloadglibc-cbce12d22b91a2393158ed7cb0a81bb26478dafd.tar
glibc-cbce12d22b91a2393158ed7cb0a81bb26478dafd.tar.gz
glibc-cbce12d22b91a2393158ed7cb0a81bb26478dafd.tar.bz2
glibc-cbce12d22b91a2393158ed7cb0a81bb26478dafd.zip
Fix test-sysvsem on some platforms
The command IPC_STAT of semctl expects an union semun in its fourth argument instead of struct semid_ds *. This can cause failures on powerpc32-linux-gnu. Checked on x86_64-linux-gnu, i686-linux-gnu, and powerpc32-linux-gnu (qemu system emulation).
-rw-r--r--ChangeLog5
-rw-r--r--sysvipc/test-sysvsem.c9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3b6df53ad..7762fb7f79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-02 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * sysvipc/test-sysvsem.c (do_test): Define and use union semun on
+ semctl.
+
2017-01-02 Joseph Myers <joseph@codesourcery.com>
* math/test-nearbyint-except.c: Include <stdbool.h>.
diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c
index 92396a60e6..279eca9b09 100644
--- a/sysvipc/test-sysvsem.c
+++ b/sysvipc/test-sysvsem.c
@@ -55,6 +55,13 @@ do_prepare (int argc, char *argv[])
#define SEM_MODE 0644
+union semun
+{
+ int val;
+ struct semid_ds *buf;
+ unsigned short *array;
+};
+
static int
do_test (void)
{
@@ -74,7 +81,7 @@ do_test (void)
/* Get semaphore kernel information and do some sanity checks. */
struct semid_ds seminfo;
- if (semctl (semid, 0, IPC_STAT, &seminfo) == -1)
+ if (semctl (semid, 0, IPC_STAT, (union semun) { .buf = &seminfo }) == -1)
FAIL_EXIT1 ("semctl with IPC_STAT failed (errno=%d)", errno);
if (seminfo.sem_perm.__key != key)