diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:44:22 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:44:22 -0400 |
| commit | 2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba (patch) | |
| tree | 0643e7cffdbb11504f6397a1eadc2c16817ae7ff | |
| parent | ad69cc2652c0422ebac3296d914c25e470498ce1 (diff) | |
| download | glibc-2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba.tar.gz glibc-2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba.tar.xz glibc-2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba.zip | |
Fix semid_ds for x86-64
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/sem.h | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ab754e5f8c..344bca7cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-09-05 Ulrich Drepper <drepper@gmail.com> + + [BZ #13144] + * sysdeps/unix/sysv/linux/x86_64/bits/sem.h (semdid_ds): Fix to match + kernel in 64-bit binaries. + 2011-08-24 David S. Miller <davem@davemloft.net> * sysdeps/sparc/sparc64/strcmp.S: Rewrite. diff --git a/NEWS b/NEWS index 89049c8333..04530bdea0 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU C Library NEWS -- history of user-visible changes. 2011-8-20 +GNU C Library NEWS -- history of user-visible changes. 2011-9-5 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc. See the end for copying conditions. @@ -9,7 +9,8 @@ Version 2.15 * The following bugs are resolved with this release: - 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021, 13114 + 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021, 13114, + 13144 * New program pldd to list loaded object of a process Implemented by Ulrich Drepper. diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h index 9b1d993ee5..7153e21431 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/sem.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -40,9 +40,13 @@ 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; +#endif __time_t sem_ctime; /* last time changed by semctl() */ +#if __WORDSIZE == 32 unsigned long int __unused2; +#endif unsigned long int sem_nsems; /* number of semaphores in set */ unsigned long int __unused3; unsigned long int __unused4; |