alpha: Remove __ASSUME_32BITUIDS.
This commit is contained in:
Richard Henderson
parent
18c2f1c075
commit
f7616d449a
|
|
@ -1,5 +1,9 @@
|
|||
2012-05-24 Richard Henderson <rth@twiddle.net>
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/msgctl.c: Remove __ASSUME_32BITUIDS.
|
||||
* sysdeps/unix/sysv/linux/alpha/semctl.c: Likewise.
|
||||
* sysdeps/unix/sysv/linux/alpha/shmctl.c: Likewise.
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/bits/mman.h (MADV_HUGEPAGE): New.
|
||||
(MADV_NOHUGEPAGE, MADV_DONTDUMP, MADV_DODUMP): New.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1995,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
||||
|
||||
|
|
@ -19,101 +19,15 @@
|
|||
#include <errno.h>
|
||||
#include <sys/msg.h>
|
||||
#include <ipc_priv.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <string.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <bp-checks.h>
|
||||
|
||||
#include <kernel-features.h>
|
||||
|
||||
struct __old_msqid_ds
|
||||
{
|
||||
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
|
||||
struct msg *__unbounded __msg_first; /* pointer to first message on queue */
|
||||
struct msg *__unbounded __msg_last; /* pointer to last message on queue */
|
||||
__time_t msg_stime; /* time of last msgsnd command */
|
||||
__time_t msg_rtime; /* time of last msgrcv command */
|
||||
__time_t msg_ctime; /* time of last change */
|
||||
struct wait_queue *__unbounded __wwait; /* ??? */
|
||||
struct wait_queue *__unbounded __rwait; /* ??? */
|
||||
unsigned short int __msg_cbytes; /* current number of bytes on queue */
|
||||
unsigned short int msg_qnum; /* number of messages currently on queue */
|
||||
unsigned short int msg_qbytes; /* max number of bytes allowed on queue */
|
||||
__ipc_pid_t msg_lspid; /* pid of last msgsnd() */
|
||||
__ipc_pid_t msg_lrpid; /* pid of last msgrcv() */
|
||||
};
|
||||
|
||||
/* Allows to control internal state and destruction of message queue
|
||||
objects. */
|
||||
int __new_msgctl (int, int, struct msqid_ds *);
|
||||
|
||||
int
|
||||
__new_msgctl (int msqid, int cmd, struct msqid_ds *buf)
|
||||
{
|
||||
/* This is a misnomer -- Alpha had 32-bit uids at the beginning
|
||||
of time. However, msg_qnum and msg_qbytes changed size at
|
||||
the same time the size of uid changed elsewhere. */
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, CHECK_1 (buf));
|
||||
#else
|
||||
switch (cmd) {
|
||||
case MSG_STAT:
|
||||
case IPC_STAT:
|
||||
case IPC_SET:
|
||||
break;
|
||||
default:
|
||||
return INLINE_SYSCALL (msgctl, 3, msqid, cmd, CHECK_1 (buf));
|
||||
}
|
||||
|
||||
{
|
||||
int save_errno = errno, result;
|
||||
struct __old_msqid_ds old;
|
||||
|
||||
/* Unfortunately there is no way how to find out for sure whether
|
||||
we should use old or new msgctl. */
|
||||
result = INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, CHECK_1 (buf));
|
||||
if (result != -1 || errno != EINVAL)
|
||||
return result;
|
||||
|
||||
__set_errno(save_errno);
|
||||
if (cmd == IPC_SET)
|
||||
{
|
||||
old.msg_perm.uid = buf->msg_perm.uid;
|
||||
old.msg_perm.gid = buf->msg_perm.gid;
|
||||
old.msg_perm.mode = buf->msg_perm.mode;
|
||||
old.msg_qbytes = buf->msg_qbytes;
|
||||
if (old.msg_perm.uid != buf->msg_perm.uid ||
|
||||
old.msg_perm.gid != buf->msg_perm.gid ||
|
||||
old.msg_qbytes != buf->msg_qbytes)
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
result = INLINE_SYSCALL (msgctl, 3, msqid, cmd, __ptrvalue (&old));
|
||||
if (result != -1 && cmd != IPC_SET)
|
||||
{
|
||||
memset(buf, 0, sizeof(*buf));
|
||||
buf->msg_perm.__key = old.msg_perm.__key;
|
||||
buf->msg_perm.uid = old.msg_perm.uid;
|
||||
buf->msg_perm.gid = old.msg_perm.gid;
|
||||
buf->msg_perm.cuid = old.msg_perm.cuid;
|
||||
buf->msg_perm.cgid = old.msg_perm.cgid;
|
||||
buf->msg_perm.mode = old.msg_perm.mode;
|
||||
buf->msg_perm.__seq = old.msg_perm.__seq;
|
||||
buf->msg_stime = old.msg_stime;
|
||||
buf->msg_rtime = old.msg_rtime;
|
||||
buf->msg_ctime = old.msg_ctime;
|
||||
buf->__msg_cbytes = old.__msg_cbytes;
|
||||
buf->msg_qnum = old.msg_qnum;
|
||||
buf->msg_qbytes = old.msg_qbytes;
|
||||
buf->msg_lspid = old.msg_lspid;
|
||||
buf->msg_lrpid = old.msg_lrpid;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#include <shlib-compat.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
/* Copyright (C) 1995,1997,1998,2000,2003,2006
|
||||
Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
||||
|
||||
|
|
@ -21,24 +20,9 @@
|
|||
#include <stdarg.h>
|
||||
#include <sys/sem.h>
|
||||
#include <ipc_priv.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <string.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include <kernel-features.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
|
||||
|
|
@ -50,11 +34,8 @@ union semun
|
|||
};
|
||||
|
||||
#include <bp-checks.h>
|
||||
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
|
||||
#include <bp-semctl.h>
|
||||
|
||||
/* Return identifier for array of NSEMS semaphores associated with
|
||||
KEY. */
|
||||
int __new_semctl (int semid, int semnum, int cmd, ...);
|
||||
|
||||
int
|
||||
__new_semctl (int semid, int semnum, int cmd, ...)
|
||||
|
|
@ -69,66 +50,8 @@ __new_semctl (int semid, int semnum, int cmd, ...)
|
|||
|
||||
va_end (ap);
|
||||
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64,
|
||||
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)->array);
|
||||
#else
|
||||
switch (cmd) {
|
||||
case SEM_STAT:
|
||||
case IPC_STAT:
|
||||
case IPC_SET:
|
||||
break;
|
||||
default:
|
||||
return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd,
|
||||
CHECK_SEMCTL (&arg, semid, cmd)->array);
|
||||
}
|
||||
|
||||
{
|
||||
int save_errno = errno, result;
|
||||
struct __old_semid_ds old;
|
||||
struct semid_ds *buf;
|
||||
|
||||
/* Unfortunately there is no way how to find out for sure whether
|
||||
we should use old or new semctl. */
|
||||
result = INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64,
|
||||
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)->array);
|
||||
if (result != -1 || errno != EINVAL)
|
||||
return result;
|
||||
|
||||
__set_errno(save_errno);
|
||||
buf = arg.buf;
|
||||
arg.buf = (void *)&old;
|
||||
if (cmd == IPC_SET)
|
||||
{
|
||||
old.sem_perm.uid = buf->sem_perm.uid;
|
||||
old.sem_perm.gid = buf->sem_perm.gid;
|
||||
old.sem_perm.mode = buf->sem_perm.mode;
|
||||
if (old.sem_perm.uid != buf->sem_perm.uid ||
|
||||
old.sem_perm.gid != buf->sem_perm.gid)
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
result = INLINE_SYSCALL (semctl, 4, semid, semnum, cmd,
|
||||
CHECK_SEMCTL (&arg, semid, cmd)->array);
|
||||
if (result != -1 && cmd != IPC_SET)
|
||||
{
|
||||
memset(buf, 0, sizeof(*buf));
|
||||
buf->sem_perm.__key = old.sem_perm.__key;
|
||||
buf->sem_perm.uid = old.sem_perm.uid;
|
||||
buf->sem_perm.gid = old.sem_perm.gid;
|
||||
buf->sem_perm.cuid = old.sem_perm.cuid;
|
||||
buf->sem_perm.cgid = old.sem_perm.cgid;
|
||||
buf->sem_perm.mode = old.sem_perm.mode;
|
||||
buf->sem_perm.__seq = old.sem_perm.__seq;
|
||||
buf->sem_otime = old.sem_otime;
|
||||
buf->sem_ctime = old.sem_ctime;
|
||||
buf->sem_nsems = old.sem_nsems;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#include <shlib-compat.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1995,1997,1998,2000,2003,2006 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
||||
|
||||
|
|
@ -19,115 +19,16 @@
|
|||
#include <errno.h>
|
||||
#include <sys/shm.h>
|
||||
#include <ipc_priv.h>
|
||||
|
||||
#include <sysdep.h>
|
||||
#include <string.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <bits/wordsize.h>
|
||||
#include <bp-checks.h>
|
||||
|
||||
#include <kernel-features.h>
|
||||
|
||||
struct __old_shmid_ds
|
||||
{
|
||||
struct __old_ipc_perm shm_perm; /* operation permission struct */
|
||||
int shm_segsz; /* size of segment in bytes */
|
||||
__time_t shm_atime; /* time of last shmat() */
|
||||
__time_t shm_dtime; /* time of last shmdt() */
|
||||
__time_t shm_ctime; /* time of last change by shmctl() */
|
||||
__ipc_pid_t shm_cpid; /* pid of creator */
|
||||
__ipc_pid_t shm_lpid; /* pid of last shmop */
|
||||
unsigned short int shm_nattch; /* number of current attaches */
|
||||
unsigned short int __shm_npages; /* size of segment (pages) */
|
||||
unsigned long int *__unbounded __shm_pages; /* array of ptrs to frames -> SHMMAX */
|
||||
struct vm_area_struct *__unbounded __attaches; /* descriptors for attaches */
|
||||
};
|
||||
|
||||
struct __old_shminfo
|
||||
{
|
||||
int shmmax;
|
||||
int shmmin;
|
||||
int shmmni;
|
||||
int shmseg;
|
||||
int shmall;
|
||||
};
|
||||
|
||||
/* Provide operations to control over shared memory segments. */
|
||||
int __new_shmctl (int, int, struct shmid_ds *);
|
||||
|
||||
int
|
||||
__new_shmctl (int shmid, int cmd, struct shmid_ds *buf)
|
||||
{
|
||||
#if __ASSUME_32BITUIDS > 0
|
||||
return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, CHECK_1 (buf));
|
||||
#else
|
||||
switch (cmd) {
|
||||
case SHM_STAT:
|
||||
case IPC_STAT:
|
||||
case IPC_SET:
|
||||
case IPC_INFO:
|
||||
break;
|
||||
default:
|
||||
return INLINE_SYSCALL (shmctl, 3, shmid, cmd, CHECK_1 (buf));
|
||||
}
|
||||
|
||||
{
|
||||
int save_errno = errno, result;
|
||||
struct __old_shmid_ds old;
|
||||
|
||||
/* Unfortunately there is no way how to find out for sure whether
|
||||
we should use old or new shmctl. */
|
||||
result = INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, CHECK_1 (buf));
|
||||
if (result != -1 || errno != EINVAL)
|
||||
return result;
|
||||
|
||||
__set_errno(save_errno);
|
||||
if (cmd == IPC_SET)
|
||||
{
|
||||
old.shm_perm.uid = buf->shm_perm.uid;
|
||||
old.shm_perm.gid = buf->shm_perm.gid;
|
||||
old.shm_perm.mode = buf->shm_perm.mode;
|
||||
if (old.shm_perm.uid != buf->shm_perm.uid ||
|
||||
old.shm_perm.gid != buf->shm_perm.gid)
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
result = INLINE_SYSCALL (shmctl, 3, shmid, cmd, __ptrvalue (&old));
|
||||
if (result != -1 && (cmd == SHM_STAT || cmd == IPC_STAT))
|
||||
{
|
||||
memset(buf, 0, sizeof(*buf));
|
||||
buf->shm_perm.__key = old.shm_perm.__key;
|
||||
buf->shm_perm.uid = old.shm_perm.uid;
|
||||
buf->shm_perm.gid = old.shm_perm.gid;
|
||||
buf->shm_perm.cuid = old.shm_perm.cuid;
|
||||
buf->shm_perm.cgid = old.shm_perm.cgid;
|
||||
buf->shm_perm.mode = old.shm_perm.mode;
|
||||
buf->shm_perm.__seq = old.shm_perm.__seq;
|
||||
buf->shm_atime = old.shm_atime;
|
||||
buf->shm_dtime = old.shm_dtime;
|
||||
buf->shm_ctime = old.shm_ctime;
|
||||
buf->shm_segsz = old.shm_segsz;
|
||||
buf->shm_nattch = old.shm_nattch;
|
||||
buf->shm_cpid = old.shm_cpid;
|
||||
buf->shm_lpid = old.shm_lpid;
|
||||
}
|
||||
else if (result != -1 && cmd == IPC_INFO)
|
||||
{
|
||||
struct __old_shminfo *oldi = (void *)&old;
|
||||
struct shminfo *i = (struct shminfo *)buf;
|
||||
|
||||
memset(i, 0, sizeof(*i));
|
||||
i->shmmax = oldi->shmmax;
|
||||
i->shmmin = oldi->shmmin;
|
||||
i->shmmni = oldi->shmmni;
|
||||
i->shmseg = oldi->shmseg;
|
||||
i->shmall = oldi->shmall;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#include <shlib-compat.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue