aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-05-21 10:40:31 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-05-21 10:43:10 -0300
commit004e52febf30012abeafb696a4f16aedd75aeb83 (patch)
tree1abd1677b7b6438eb25dfc89e6df95b0ea8d0056
parentc9c15ac3162d10a999bf71418fd710bf5676175e (diff)
downloadglibc-004e52febf30012abeafb696a4f16aedd75aeb83.tar.gz
glibc-004e52febf30012abeafb696a4f16aedd75aeb83.tar.xz
glibc-004e52febf30012abeafb696a4f16aedd75aeb83.zip
sysvipc: Add missing bit of semtimedop s390 consolidation
This patch add the missing SEMTIMEDOP_IPC_ARGS definions on powerpc and sparc ipc_priv.h. Checked on powerpc64le-linux-gnu and with a build for sparc64-linux-gnu. * sysdeps/unix/sysv/linux/powerpc/ipc_priv.h (SEMTIMEDOP_IPC_ARGS): New define. * sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h (SEMTIMEDOP_IPC_ARGS): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/ipc_priv.h3
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h3
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 35e6f7c3223..324964a73d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-21 Adhemeval Zanella <adhemerval.zanella@linaro.org>
+
+ * sysdeps/unix/sysv/linux/powerpc/ipc_priv.h (SEMTIMEDOP_IPC_ARGS):
+ New define.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h
+ (SEMTIMEDOP_IPC_ARGS): Likewise.
+
2019-05-21 Florian Weimer <fweimer@redhat.com>
[BZ #24584]
diff --git a/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h b/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h
index 3450933f56d..304ecc8d538 100644
--- a/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h
+++ b/sysdeps/unix/sysv/linux/powerpc/ipc_priv.h
@@ -36,4 +36,7 @@ struct __old_ipc_perm
#define MSGRCV_ARGS(__msgp, __msgtyp) \
((long int []){ (long int) __msgp, __msgtyp })
+#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \
+ (__nsops), 0, (__sops), (__timeout)
+
#include <ipc_ops.h>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h b/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h
index 8936aed0229..e436599098a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/ipc_priv.h
@@ -38,4 +38,7 @@ struct __old_ipc_perm
/* Also for msgrcv it does not use the kludge on final 2 arguments. */
#define MSGRCV_ARGS(__msgp, __msgtyp) __msgp, __msgtyp
+#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \
+ (__nsops), 0, (__sops), (__timeout)
+
#include <ipc_ops.h>