diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:31:50 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:31:50 +0100 |
commit | d421cfc9bd0275f1d81bd8757b80ff568c7b2826 (patch) | |
tree | 46b47f0c1b7a64e2697516b627be8464d15ab797 /sysdeps/unix/sysv/linux/bits | |
parent | 1cbf52cde38c2c2c2d8ffdd55cd73f864d79abda (diff) | |
parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) |
Merge commit 'refs/top-bases/t/no-hp-timing' into t/no-hp-timing
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits')
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/fcntl-linux.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/in.h | 12 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/ipc.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/msq.h | 10 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/sem.h | 8 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/shm.h | 18 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/stat.h | 4 |
7 files changed, 38 insertions, 22 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h index b5929bd292..9b0421ee0c 100644 --- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h +++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h @@ -96,6 +96,9 @@ #ifndef __O_DSYNC # define __O_DSYNC 010000 #endif +#ifndef __O_TMPFILE +# define __O_TMPFILE 020200000 +#endif #ifndef F_GETLK # ifndef __USE_FILE_OFFSET64 @@ -128,6 +131,7 @@ # define O_DIRECT __O_DIRECT /* Direct disk access. */ # define O_NOATIME __O_NOATIME /* Do not set atime. */ # define O_PATH __O_PATH /* Resolve pathname but do not open file. */ +# define O_TMPFILE __O_TMPFILE /* Atomically create nameless file. */ #endif /* For now, Linux has no separate synchronicitiy options for read diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h index e959b33eac..d763ce9fc2 100644 --- a/sysdeps/unix/sysv/linux/bits/in.h +++ b/sysdeps/unix/sysv/linux/bits/in.h @@ -21,6 +21,18 @@ # error "Never use <bits/in.h> directly; include <netinet/in.h> instead." #endif +/* If the application has already included linux/in6.h from a linux-based + kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the + defines), sockaddr_in6, or ipv6_mreq. The ABI used by the linux-kernel and + glibc match exactly. Neither the linux kernel nor glibc should break this + ABI without coordination. */ +#ifdef _UAPI_LINUX_IN6_H +/* This is not quite the same API since the kernel always defines s6_addr16 and + s6_addr32. This is not a violation of POSIX since POSIX says "at least the + following member" and that holds true. */ +# define __USE_KERNEL_IPV6_DEFS +#endif + /* Options for use with `getsockopt' and `setsockopt' at the IP level. The first word in the comment at the right is the data type used; "bool" means a boolean value stored in an `int'. */ diff --git a/sysdeps/unix/sysv/linux/bits/ipc.h b/sysdeps/unix/sysv/linux/bits/ipc.h index a29cb6db28..9460643e73 100644 --- a/sysdeps/unix/sysv/linux/bits/ipc.h +++ b/sysdeps/unix/sysv/linux/bits/ipc.h @@ -50,6 +50,6 @@ struct ipc_perm unsigned short int __pad1; unsigned short int __seq; /* Sequence number. */ unsigned short int __pad2; - __syscall_ulong_t __unused1; - __syscall_ulong_t __unused2; + __syscall_ulong_t __glibc_reserved1; + __syscall_ulong_t __glibc_reserved2; }; diff --git a/sysdeps/unix/sysv/linux/bits/msq.h b/sysdeps/unix/sysv/linux/bits/msq.h index 8f6eb8a7d0..59fc2fdcc3 100644 --- a/sysdeps/unix/sysv/linux/bits/msq.h +++ b/sysdeps/unix/sysv/linux/bits/msq.h @@ -39,18 +39,18 @@ struct msqid_ds { struct ipc_perm msg_perm; /* structure describing operation permission */ __time_t msg_stime; /* time of last msgsnd command */ - unsigned long int __unused1; + unsigned long int __glibc_reserved1; __time_t msg_rtime; /* time of last msgrcv command */ - unsigned long int __unused2; + unsigned long int __glibc_reserved2; __time_t msg_ctime; /* time of last change */ - unsigned long int __unused3; + unsigned long int __glibc_reserved3; unsigned long int __msg_cbytes; /* current number of bytes on queue */ msgqnum_t msg_qnum; /* number of messages currently on queue */ msglen_t msg_qbytes; /* max number of bytes allowed on queue */ __pid_t msg_lspid; /* pid of last msgsnd() */ __pid_t msg_lrpid; /* pid of last msgrcv() */ - unsigned long int __unused4; - unsigned long int __unused5; + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; }; #ifdef __USE_MISC diff --git a/sysdeps/unix/sysv/linux/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h index 62f5407415..26ea325a19 100644 --- a/sysdeps/unix/sysv/linux/bits/sem.h +++ b/sysdeps/unix/sysv/linux/bits/sem.h @@ -39,12 +39,12 @@ struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ __time_t sem_otime; /* last semop() time */ - unsigned long int __unused1; + unsigned long int __glibc_reserved1; __time_t sem_ctime; /* last time changed by semctl() */ - unsigned long int __unused2; + unsigned long int __glibc_reserved2; unsigned long int sem_nsems; /* number of semaphores in set */ - unsigned long int __unused3; - unsigned long int __unused4; + unsigned long int __glibc_reserved3; + unsigned long int __glibc_reserved4; }; /* The user should define a union like the following to use it for arguments diff --git a/sysdeps/unix/sysv/linux/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h index e0ad934df3..5390d66cfa 100644 --- a/sysdeps/unix/sysv/linux/bits/shm.h +++ b/sysdeps/unix/sysv/linux/bits/shm.h @@ -51,16 +51,16 @@ struct shmid_ds struct ipc_perm shm_perm; /* operation permission struct */ size_t shm_segsz; /* size of segment in bytes */ __time_t shm_atime; /* time of last shmat() */ - unsigned long int __unused1; + unsigned long int __glibc_reserved1; __time_t shm_dtime; /* time of last shmdt() */ - unsigned long int __unused2; + unsigned long int __glibc_reserved2; __time_t shm_ctime; /* time of last change by shmctl() */ - unsigned long int __unused3; + unsigned long int __glibc_reserved3; __pid_t shm_cpid; /* pid of creator */ __pid_t shm_lpid; /* pid of last shmop */ shmatt_t shm_nattch; /* number of current attaches */ - unsigned long int __unused4; - unsigned long int __unused5; + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; }; #ifdef __USE_MISC @@ -82,10 +82,10 @@ struct shminfo unsigned long int shmmni; unsigned long int shmseg; unsigned long int shmall; - unsigned long int __unused1; - unsigned long int __unused2; - unsigned long int __unused3; - unsigned long int __unused4; + unsigned long int __glibc_reserved1; + unsigned long int __glibc_reserved2; + unsigned long int __glibc_reserved3; + unsigned long int __glibc_reserved4; }; struct shm_info diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h index d71093ef3f..65e2a5a30a 100644 --- a/sysdeps/unix/sysv/linux/bits/stat.h +++ b/sysdeps/unix/sysv/linux/bits/stat.h @@ -84,8 +84,8 @@ struct stat unsigned long int st_ctimensec; /* Nsecs of last status change. */ #endif #ifndef __USE_FILE_OFFSET64 - unsigned long int __unused4; - unsigned long int __unused5; + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; #else __ino64_t st_ino; /* File serial number. */ #endif |