Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use __glibc_reserved instead __unused.
  • Loading branch information
Ondřej Bílka committed Nov 26, 2013
1 parent 246b279 commit d1d9eaf
Show file tree
Hide file tree
Showing 86 changed files with 385 additions and 294 deletions.
48 changes: 48 additions & 0 deletions ChangeLog
@@ -1,3 +1,51 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* resolv/netdb.h: Use __glibc_reserved instead __unused.
* rt/aio.h: Likewise.
* sysdeps/gnu/bits/utmp.h: Likewise.
* sysdeps/gnu/bits/utmpx.h: Likewise.
* sysdeps/gnu/netinet/ip_icmp.h: Likewise.
* sysdeps/unix/sysv/linux/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/ntp_gettimex.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/utmp.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/utmpx.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h: Likewise.
* sysdeps/unix/sysv/linux/sh/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise.
* sysdeps/unix/sysv/linux/sys/timex.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/x86/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/xstatconv.c: Likewise.
* sysdeps/x86/fpu/bits/fenv.h: Likewise.

2013-11-25 Carlos O'Donell <carlos@redhat.com>

[BZ #16245]
Expand Down
4 changes: 4 additions & 0 deletions nptl/ChangeLog
@@ -1,3 +1,7 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/i386/tls.h: Use __glibc_reserved instead __unused.
* sysdeps/x86_64/tls.h: Likewise.

2013-11-25 Paul Pluzhnikov <ppluzhnikov@google.com>

[BZ #11214]
Expand Down
2 changes: 1 addition & 1 deletion nptl/sysdeps/i386/tls.h
Expand Up @@ -56,7 +56,7 @@ typedef struct
#ifndef __ASSUME_PRIVATE_FUTEX
int private_futex;
#else
int __unused1;
int __glibc_reserved1;
#endif
/* Reservation of some values for the TM ABI. */
void *__private_tm[4];
Expand Down
4 changes: 2 additions & 2 deletions nptl/sysdeps/x86_64/tls.h
Expand Up @@ -65,14 +65,14 @@ typedef struct
# ifndef __ASSUME_PRIVATE_FUTEX
int private_futex;
# else
int __unused1;
int __glibc_reserved1;
# endif
int rtld_must_xmm_save;
/* Reservation of some values for the TM ABI. */
void *__private_tm[4];
/* GCC split stack support. */
void *__private_ss;
long int __unused2;
long int __glibc_reserved2;
/* Have space for the post-AVX register size. */
__128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));

Expand Down
9 changes: 9 additions & 0 deletions ports/ChangeLog.alpha
@@ -1,3 +1,12 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Use __glibc_reserved instead __unused.
* sysdeps/unix/sysv/linux/alpha/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise.

2013-11-16 Richard Henderson <rth@redhat.com>

* sysdeps/unix/sysv/linux/alpha/rt_sigaction.S: Include a nop
Expand Down
3 changes: 3 additions & 0 deletions ports/ChangeLog.arm
@@ -1,3 +1,6 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/arm/bits/shm.h: Use __glibc_reserved instead __unused.

2013-11-22 Roland McGrath <roland@hack.frob.com>

* sysdeps/arm/armv7/multiarch/memcpy_impl.S
Expand Down
7 changes: 7 additions & 0 deletions ports/ChangeLog.hppa
@@ -1,3 +1,10 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/hppa/bits/ipc.h: Use __glibc_reserved instead __unused.
* sysdeps/unix/sysv/linux/hppa/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Likewise.

2013-11-21 Guy Martin <gmsoft@tuxicoman.be>

* sysdeps/hppa/dl-lookupcfg.h: Remove obsolete
Expand Down
7 changes: 7 additions & 0 deletions ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/ia64/bits/ipc.h: Use __glibc_reserved instead __unused.
* sysdeps/unix/sysv/linux/ia64/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.

2013-11-21 Guy Martin <gmsoft@tuxicoman.be>

* sysdeps/ia64/dl-lookupcfg.h: Remove obsolete
Expand Down
3 changes: 3 additions & 0 deletions ports/ChangeLog.m68k
@@ -1,3 +1,6 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use __glibc_reserved instead __unused.

2013-10-30 Mike Frysinger <vapier@gentoo.org>

* sysdeps/unix/sysv/linux/m68k/configure.in: Moved to ...
Expand Down
4 changes: 4 additions & 0 deletions ports/ChangeLog.microblaze
@@ -1,3 +1,7 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/microblaze/bits/stat.h: Use __glibc_reserved instead __unused.
* sysdeps/unix/sysv/linux/microblaze/kernel_stat.h: Likewise.

2013-10-30 Mike Frysinger <vapier@gentoo.org>

* sysdeps/unix/sysv/linux/microblaze/configure.in: Moved to ...
Expand Down
6 changes: 6 additions & 0 deletions ports/ChangeLog.mips
@@ -1,3 +1,9 @@
2013-11-26 Ondřej Bílka <neleai@seznam.cz>
* sysdeps/unix/sysv/linux/mips/bits/ipc.h: Use __glibc_reserved instead __unused.
* sysdeps/unix/sysv/linux/mips/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.

2013-10-30 Mike Frysinger <vapier@gentoo.org>

* sysdeps/mips/configure.in: Moved to ...
Expand Down
4 changes: 2 additions & 2 deletions ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
Expand Up @@ -49,6 +49,6 @@ struct ipc_perm
unsigned int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
unsigned short int __pad1;
unsigned long int __unused1;
unsigned long int __unused2;
unsigned long int __glibc_reserved1;
unsigned long int __glibc_reserved2;
};
4 changes: 2 additions & 2 deletions ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
Expand Up @@ -46,8 +46,8 @@ struct msqid_ds
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 __unused1;
unsigned long int __unused2;
unsigned long int __glibc_reserved1;
unsigned long int __glibc_reserved2;
};

#ifdef __USE_MISC
Expand Down
4 changes: 2 additions & 2 deletions ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
Expand Up @@ -41,8 +41,8 @@ struct semid_ds
__time_t sem_otime; /* last semop() time */
__time_t sem_ctime; /* last time changed by semctl() */
unsigned long int sem_nsems; /* number of semaphores in set */
unsigned long int __unused1;
unsigned long int __unused2;
unsigned long int __glibc_reserved1;
unsigned long int __glibc_reserved2;
};

/* The user should define a union like the following to use it for arguments
Expand Down
12 changes: 6 additions & 6 deletions ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
Expand Up @@ -56,8 +56,8 @@ struct shmid_ds
__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 __unused1;
unsigned long int __unused2;
unsigned long int __glibc_reserved1;
unsigned long int __glibc_reserved2;
};

#ifdef __USE_MISC
Expand All @@ -79,10 +79,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
Expand Down
4 changes: 2 additions & 2 deletions ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
Expand Up @@ -92,7 +92,7 @@ struct stat
__ST_TIME(a); /* Time of last access. */
__ST_TIME(m); /* Time of last modification. */
__ST_TIME(c); /* Time of last status change. */
long __unused[3];
long __glibc_reserved[3];
};

#ifdef __USE_LARGEFILE64
Expand All @@ -113,7 +113,7 @@ struct stat64
__ST_TIME(a); /* Time of last access. */
__ST_TIME(m); /* Time of last modification. */
__ST_TIME(c); /* Time of last status change. */
long __unused[3];
long __glibc_reserved[3];
};
#endif

Expand Down
4 changes: 2 additions & 2 deletions ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
Expand Up @@ -40,7 +40,7 @@ struct kernel_stat64
unsigned long st_mtimensec;
unsigned long st_ctime;
unsigned long st_ctimensec;
long __unused[3];
long __glibc_reserved[3];
};

/* Definition of `struct stat' used by glibc 2.0. */
Expand Down Expand Up @@ -82,7 +82,7 @@ struct glibc21_stat
unsigned int st_flags;
unsigned int st_gen;
int __pad3;
long __unused[4];
long __glibc_reserved[4];
};

#define XSTAT_IS_XSTAT64 1
14 changes: 7 additions & 7 deletions ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
Expand Up @@ -74,10 +74,10 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
buf->st_flags = kbuf->st_flags;
buf->st_gen = kbuf->st_gen;
buf->__pad3 = 0;
buf->__unused[0] = 0;
buf->__unused[1] = 0;
buf->__unused[2] = 0;
buf->__unused[3] = 0;
buf->__glibc_reserved[0] = 0;
buf->__glibc_reserved[1] = 0;
buf->__glibc_reserved[2] = 0;
buf->__glibc_reserved[3] = 0;
}
break;

Expand Down Expand Up @@ -105,9 +105,9 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
buf->st_ctime = kbuf->st_ctime;
buf->st_ctimensec = 0;

buf->__unused[0] = 0;
buf->__unused[1] = 0;
buf->__unused[2] = 0;
buf->__glibc_reserved[0] = 0;
buf->__glibc_reserved[1] = 0;
buf->__glibc_reserved[2] = 0;
}
break;

Expand Down
18 changes: 9 additions & 9 deletions ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
Expand Up @@ -41,23 +41,23 @@ struct msqid_ds
struct ipc_perm msg_perm; /* structure describing operation permission */
__time_t msg_stime; /* time of last msgsnd command */
#if __WORDSIZE == 32
unsigned long int __unused1;
unsigned long int __glibc_reserved1;
#endif
__time_t msg_rtime; /* time of last msgrcv command */
#if __WORDSIZE == 32
unsigned long int __unused2;
unsigned long int __glibc_reserved2;
#endif
__time_t msg_ctime; /* time of last change */
#if __WORDSIZE == 32
unsigned long int __unused3;
unsigned long int __glibc_reserved3;
#endif
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
Expand Down
8 changes: 4 additions & 4 deletions ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
Expand Up @@ -42,15 +42,15 @@ struct semid_ds
struct ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
#if __WORDSIZE == 32
unsigned long int __unused1;
unsigned long int __glibc_reserved1;
#endif
__time_t sem_ctime; /* last time changed by semctl() */
#if __WORDSIZE == 32
unsigned long int __unused2;
unsigned long int __glibc_reserved2;
#endif
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
Expand Down

0 comments on commit d1d9eaf

Please sign in to comment.