From cbce12d22b91a2393158ed7cb0a81bb26478dafd Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 2 Jan 2017 16:19:48 -0200 Subject: [PATCH] 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). --- ChangeLog | 5 +++++ sysvipc/test-sysvsem.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b3b6df53ad0..7762fb7f794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-01-02 Adhemerval Zanella + + * sysvipc/test-sysvsem.c (do_test): Define and use union semun on + semctl. + 2017-01-02 Joseph Myers * math/test-nearbyint-except.c: Include . diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c index 92396a60e6c..279eca9b096 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) -- 2.39.2