@@ -117,12 +117,8 @@ int
attribute_compat_text_section
__old_msgctl (int msqid, int cmd, struct __old_msqid_ds *buf)
{
-#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS \
- && !defined __ASSUME_SYSVIPC_DEFAULT_IPC_64
- /* For architecture that have wire-up msgctl but also have __IPC_64 to a
- value different than default (0x0) it means the compat symbol used the
- __NR_ipc syscall. */
- return INLINE_SYSCALL_CALL (msgctl, msqid, cmd, buf);
+#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
+ return INLINE_SYSCALL_CALL (msgctl, msqid, cmd | __IPC_64, buf);
#else
return INLINE_SYSCALL_CALL (ipc, IPCOP_msgctl, msqid, cmd, 0, buf);
#endif
@@ -174,12 +174,9 @@ __old_semctl (int semid, int semnum, int cmd, ...)
break;
}
-#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS \
- && !defined __ASSUME_SYSVIPC_DEFAULT_IPC_64
- /* For architectures that have wire-up semctl but also have __IPC_64 to a
- value different than default (0x0) it means the compat symbol used the
- __NR_ipc syscall. */
- return INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd, arg.array);
+#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
+ return INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd | __IPC_64,
+ arg.array);
# else
return INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd,
SEMCTL_ARG_ADDRESS (arg));
@@ -117,12 +117,8 @@ int
attribute_compat_text_section
__old_shmctl (int shmid, int cmd, struct __old_shmid_ds *buf)
{
-#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS \
- && !defined __ASSUME_SYSVIPC_DEFAULT_IPC_64
- /* For architecture that have wire-up shmctl but also have __IPC_64 to a
- value different than default (0x0), it means the compat symbol used the
- __NR_ipc syscall. */
- return INLINE_SYSCALL_CALL (shmctl, shmid, cmd, buf);
+#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
+ return INLINE_SYSCALL_CALL (shmctl, shmid, cmd | __IPC_64, buf);
#else
return INLINE_SYSCALL_CALL (ipc, IPCOP_shmctl, shmid, cmd, 0, buf);
#endif