From: Ryan Arnold Date: Wed, 5 Aug 2009 19:26:18 +0000 (-0500) Subject: PowerPC PRIVATE FUTEX support picked from git commits: 619cc2f69d1670f8b81196e31f6009... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b660b54ce6cbc72b41204cd437d66d75fda2db3c;p=thirdparty%2Fglibc.git PowerPC PRIVATE FUTEX support picked from git commits: 619cc2f69d1670f8b81196e31f60092334bf562b 1311b164df26ee49740b805d4f32fffde163b1e6 --- diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a1cb40c46ee..d8d0174a3a0 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2008-04-28 Hiroki Kaminaga + + [BZ #6740] + * sysdeps/powerpc/tcb-offsets.sym (PRIVATE_FUTEX_OFFSET): Guard symbol + definition with #ifndef __ASSUME_PRIVATE_FUTEX. + 2008-04-14 David S. Miller * 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 eda43dce8e7..8ac133dfd07 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