diff options
| author | Ryan Arnold <ryanarn@etna.rchland.ibm.com> | 2009-08-05 14:26:18 -0500 |
|---|---|---|
| committer | Ryan Arnold <ryanarn@etna.rchland.ibm.com> | 2009-08-05 14:28:25 -0500 |
| commit | b660b54ce6cbc72b41204cd437d66d75fda2db3c (patch) | |
| tree | ca3734e0d60fd440c172cc223bb7db605a8b46bc | |
| parent | b880e57e2d2d9c3cab664bced7cdb7b84c10c7a5 (diff) | |
| download | glibc-b660b54ce6cbc72b41204cd437d66d75fda2db3c.zip glibc-b660b54ce6cbc72b41204cd437d66d75fda2db3c.tar.gz glibc-b660b54ce6cbc72b41204cd437d66d75fda2db3c.tar.bz2 | |
PowerPC PRIVATE FUTEX support picked from git commits: 619cc2f69d1670f8b81196e31f60092334bf562b 1311b164df26ee49740b805d4f32fffde163b1e6
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/powerpc/tcb-offsets.sym | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a1cb40c..d8d0174 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2008-04-28 Hiroki Kaminaga <kaminaga@sm.sony.co.jp> + + [BZ #6740] + * sysdeps/powerpc/tcb-offsets.sym (PRIVATE_FUTEX_OFFSET): Guard symbol + definition with #ifndef __ASSUME_PRIVATE_FUTEX. + 2008-04-14 David S. Miller <davem@davemloft.net> * sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c diff --git a/nptl/sysdeps/powerpc/tcb-offsets.sym b/nptl/sysdeps/powerpc/tcb-offsets.sym index eda43dc..8ac133d 100644 --- a/nptl/sysdeps/powerpc/tcb-offsets.sym +++ b/nptl/sysdeps/powerpc/tcb-offsets.sym @@ -15,4 +15,6 @@ MULTIPLE_THREADS_OFFSET thread_offsetof (header.multiple_threads) PID thread_offsetof (pid) TID thread_offsetof (tid) POINTER_GUARD (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t)) +#ifndef __ASSUME_PRIVATE_FUTEX PRIVATE_FUTEX_OFFSET thread_offsetof (header.private_futex) +#endif |