diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-10-26 18:04:48 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-12-28 20:31:05 -0200 |
| commit | 8232e7d2097eb8e5ca5548ff1ae3f7257f274a87 (patch) | |
| tree | 22600c77563c75b0a6485fe61bac68bcdcb9d635 /sysdeps/unix/sysv/linux/shmat.c | |
| parent | 1afc369f1aa153ffcfbc50b4e840bdf5746b705d (diff) | |
| download | glibc-8232e7d2097eb8e5ca5548ff1ae3f7257f274a87.tar.gz glibc-8232e7d2097eb8e5ca5548ff1ae3f7257f274a87.tar.xz glibc-8232e7d2097eb8e5ca5548ff1ae3f7257f274a87.zip | |
Use shmat syscall for Linux implementation
This patch add a direct call to shmat syscall if it is supported by kernel features. Checked on x86_64, i686, powerpc64le, aarch64, and armhf. * sysdeps/unix/sysv/linux/alpha/syscalls.list (shmat): Remove. * sysdeps/unix/sysv/linux/arm/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/generic/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/hppa/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/ia64/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/microblaze/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/x86_64/syscalls.list (shmat): Likewise. * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat): Define to __NR_osf_shmat. * sysdeps/unix/sysv/linux/shmat.c (shmat): Use shmat syscall if it is defined.
Diffstat (limited to 'sysdeps/unix/sysv/linux/shmat.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/shmat.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index 5afc93c9a9..d1ef323e37 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -16,13 +16,10 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <errno.h> -#include <sys/shm.h> +#include <sys/msg.h> #include <ipc_priv.h> - #include <sysdep.h> -#include <unistd.h> -#include <sys/syscall.h> +#include <errno.h> /* Attach the shared memory segment associated with SHMID to the data segment of the calling process. SHMADDR and SHMFLG determine how @@ -31,17 +28,19 @@ void * shmat (int shmid, const void *shmaddr, int shmflg) { +#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS + return (void*) INLINE_SYSCALL_CALL (shmat, shmid, shmaddr, shmflg); +#else INTERNAL_SYSCALL_DECL(err); unsigned long resultvar; void *raddr; - resultvar = INTERNAL_SYSCALL (ipc, err, 5, IPCOP_shmat, - shmid, shmflg, - (long int) &raddr, - (void *) shmaddr); + resultvar = INTERNAL_SYSCALL_CALL (ipc, err, IPCOP_shmat, shmid, shmflg, + &raddr, shmaddr); if (INTERNAL_SYSCALL_ERROR_P (resultvar, err)) return (void *) INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (resultvar, err)); return raddr; +#endif } |