Bug#691173: build bug can lead to locking problems on some arches

[Steve McIntyre <steve@einval.com>]

Package: libc6
Version: 2.13-35
Severity: serious
Tags: upstream patch

Hi folks,

Just been directed to the bug discussion at

  http://sourceware.org/bugzilla/show_bug.cgi?id=13844

In some cases, the (e)glibc build will pick up an incorrect version of
lowlevellock.c and this can cause futex deadlocks. Although the
subject specifically mentions sparc, this is expected to impact ARM
too. AFAICS our current eglibc in unstable will include this
problem. Simple patch from glibc upstream:

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 700fb72..7c6005b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-16  David S. Miller  <davem@davemloft.net>
+
+       [BZ #13844]
+       * sysdeps/unix/sysv/linux/libc-lowlevellock.c: Include using
<..>
+       instead of "...".
+       * sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c:
+       Delete, not needed.
+
 2012-03-15  David S. Miller  <davem@davemloft.net>
 
        [BZ #13844]
diff --git a/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
b/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
index 28672a6..4883765 100644
--- a/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
+++ b/nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 /* No difference to lowlevellock.c, except we lose a couple of
 functions.  */
-#include "lowlevellock.c"
+#include <lowlevellock.c>
diff --git
 a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c
 b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c
deleted file mode 100644
index 61296a4..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/libc-lowlevellock.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "lowlevellock.c"


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)
Shell: /bin/sh linked to /bin/dash

Versions of packages libc6 depends on:
ii  libc-bin  2.13-35
ii  libgcc1   1:4.7.2-4

libc6 recommends no packages.

Versions of packages libc6 suggests:
ii  debconf [debconf-2.0]  1.5.46
pn  glibc-doc              <none>
ii  locales                2.13-35

-- debconf information excluded