PowerPC PRIVATE FUTEX support picked from git commits: 619cc2f69d1670f8b81196e31f6009...

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a1cb40c46ee81019390c3044091c12cec2e2d244..d8d0174a3a059f6d6d9fa778396ee509956fff36 100644 (file)
--- 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 eda43dce8e70f058c49b4617ab4697129a9d2318..8ac133dfd075041c02d442579e2b30aba25900c3 100644 (file)
--- 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