diff options
author | Andreas Schwab <schwab@suse.de> | 2015-08-18 10:29:30 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@suse.de> | 2015-08-24 10:53:49 +0200 |
commit | be481652f272acc117907ac30157cdac46aa1973 (patch) | |
tree | 8348fc9682ccae31a964fc04c6969e023bd2addb /sysdeps/unix/sysv/linux/sparc | |
parent | 1695cdae065fa3693e7b18169a100f53444eac69 (diff) | |
download | glibc-be481652f272acc117907ac30157cdac46aa1973.tar.gz glibc-be481652f272acc117907ac30157cdac46aa1973.tar.xz glibc-be481652f272acc117907ac30157cdac46aa1973.zip |
Remove __ASSUME_IPC64
PowerPC has always used __IPC_64 like most other architectures, which means that __ASSUME_IPC64 can be always true. Also, all other architecture implementations that use the ipc syscall are effectively identical to the generic version and can be removed.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc')
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/msgctl.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c | 120 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/shmctl.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c | 36 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c | 54 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c | 35 |
6 files changed, 0 insertions, 247 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/msgctl.c b/sysdeps/unix/sysv/linux/sparc/sparc32/msgctl.c deleted file mode 100644 index 9f9b8431a3..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/msgctl.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/msgctl.c> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c b/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c deleted file mode 100644 index 26cfab19b8..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c +++ /dev/null @@ -1,120 +0,0 @@ -/* Semctl for architectures where word sized unions are passed indirectly - Copyright (C) 1995-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <stdarg.h> -#include <sys/sem.h> -#include <ipc_priv.h> - -#include <sysdep.h> -#include <string.h> -#include <sys/syscall.h> - -#include <shlib-compat.h> - -struct __old_semid_ds -{ - struct __old_ipc_perm sem_perm; /* operation permission struct */ - __time_t sem_otime; /* last semop() time */ - __time_t sem_ctime; /* last time changed by semctl() */ - struct sem *__sembase; /* ptr to first semaphore in array */ - struct sem_queue *__sem_pending; /* pending operations */ - struct sem_queue *__sem_pending_last; /* last pending operation */ - struct sem_undo *__undo; /* ondo requests on this array */ - unsigned short int sem_nsems; /* number of semaphores in set */ -}; - -/* Define a `union semun' suitable for Linux here. */ -union semun -{ - int val; /* value for SETVAL */ - struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ - unsigned short int *array; /* array for GETALL & SETALL */ - struct seminfo *__buf; /* buffer for IPC_INFO */ - struct __old_semid_ds *__old_buf; -}; - -/* Return identifier for array of NSEMS semaphores associated with - KEY. */ -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) -int __old_semctl (int semid, int semnum, int cmd, ...); -#endif -int __new_semctl (int semid, int semnum, int cmd, ...); - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) -int -attribute_compat_text_section -__old_semctl (int semid, int semnum, int cmd, ...) -{ - union semun arg; - va_list ap; - - /* Get the argument only if required. */ - arg.buf = NULL; - switch (cmd) - { - case SETVAL: /* arg.val */ - case GETALL: /* arg.array */ - case SETALL: - case IPC_STAT: /* arg.buf */ - case IPC_SET: - case SEM_STAT: - case IPC_INFO: /* arg.__buf */ - case SEM_INFO: - va_start (ap, cmd); - arg = va_arg (ap, union semun); - va_end (ap); - break; - } - - return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - &arg); -} -compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); -#endif - -int -__new_semctl (int semid, int semnum, int cmd, ...) -{ - union semun arg; - va_list ap; - - /* Get the argument only if required. */ - arg.buf = NULL; - switch (cmd) - { - case SETVAL: /* arg.val */ - case GETALL: /* arg.array */ - case SETALL: - case IPC_STAT: /* arg.buf */ - case IPC_SET: - case SEM_STAT: - case IPC_INFO: /* arg.__buf */ - case SEM_INFO: - va_start (ap, cmd); - arg = va_arg (ap, union semun); - va_end (ap); - break; - } - - return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - &arg); -} - -versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/shmctl.c b/sysdeps/unix/sysv/linux/sparc/sparc32/shmctl.c deleted file mode 100644 index 7eac6380dd..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/shmctl.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/shmctl.c> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c b/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c deleted file mode 100644 index 88a36dcf0f..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <sys/msg.h> -#include <ipc_priv.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Allows to control internal state and destruction of message queue - objects. */ - -int -msgctl (msqid, cmd, buf) - int msqid; - int cmd; - struct msqid_ds *buf; -{ - return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, buf); -} diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c b/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c deleted file mode 100644 index 2714728a63..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <stdarg.h> -#include <sys/sem.h> -#include <ipc_priv.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Define a `union semun' suitable for Linux here. */ -union semun -{ - int val; /* value for SETVAL */ - struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ - unsigned short int *array; /* array for GETALL & SETALL */ - struct seminfo *__buf; /* buffer for IPC_INFO */ -}; - -/* Return identifier for array of NSEMS semaphores associated with - KEY. */ - -int -semctl (int semid, int semnum, int cmd, ...) -{ - union semun arg; - va_list ap; - - va_start (ap, cmd); - - /* Get the argument. */ - arg = va_arg (ap, union semun); - - va_end (ap); - - return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - arg.array); -} diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c b/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c deleted file mode 100644 index bb76b192fe..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <sys/shm.h> -#include <ipc_priv.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Provide operations to control over shared memory segments. */ - -int -shmctl (shmid, cmd, buf) - int shmid; - int cmd; - struct shmid_ds *buf; -{ - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); -} |