This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch jessie
in repository glibc.
commit 204a6920cc979124f82508cbbf024f263e4f9d37
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Tue Nov 22 23:36:05 2016 +0100
debian/sysdeps/{amd64,i386,x32}.mk: disable lock elision (aka Intel TSX) on
x86 architectures. This causes programs (wrongly) unlocking an already unlocked
mutex to abort. More importantly most of the other distributions decided to
disable it, so we don't want to be the only distribution left testing this code
path.
---
debian/changelog | 5 +++++
debian/sysdeps/amd64.mk | 2 +-
debian/sysdeps/i386.mk | 2 +-
debian/sysdeps/x32.mk | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4f41c2..4fdfb65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ glibc (2.19-18+deb8u7) UNRELEASED; urgency=medium
* debian/patches/any/cvs-hesiod-resolver.diff: patch from upstream to
fix a regression introduced by cvs-resolv-ipv6-nameservers.diff in
hesiod. Closes: #821358.
+ * debian/sysdeps/{amd64,i386,x32}.mk: disable lock elision (aka Intel TSX)
+ on x86 architectures. This causes programs (wrongly) unlocking an already
+ unlocked mutex to abort. More importantly most of the other distributions
+ decided to disable it, so we don't want to be the only distribution left
+ testing this code path.
-- Aurelien Jarno <aure...@debian.org> Sun, 04 Sep 2016 01:26:19 +0200
diff --git a/debian/sysdeps/amd64.mk b/debian/sysdeps/amd64.mk
index 497a006..50cb63a 100644
--- a/debian/sysdeps/amd64.mk
+++ b/debian/sysdeps/amd64.mk
@@ -1,5 +1,5 @@
libc_rtlddir = /lib64
-extra_config_options = --enable-multi-arch --enable-lock-elision
+extra_config_options = --enable-multi-arch
# build 32-bit (i386) alternative library
GLIBC_MULTILIB_PASSES += i386
diff --git a/debian/sysdeps/i386.mk b/debian/sysdeps/i386.mk
index 8f6c494..a3ae225 100644
--- a/debian/sysdeps/i386.mk
+++ b/debian/sysdeps/i386.mk
@@ -1,4 +1,4 @@
-extra_config_options = --enable-multi-arch --enable-lock-elision
+extra_config_options = --enable-multi-arch
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
diff --git a/debian/sysdeps/x32.mk b/debian/sysdeps/x32.mk
index 42dd2a1..37e9ca1 100644
--- a/debian/sysdeps/x32.mk
+++ b/debian/sysdeps/x32.mk
@@ -1,5 +1,5 @@
libc_rtlddir = /libx32
-extra_config_options = --enable-multi-arch --enable-lock-elision
+extra_config_options = --enable-multi-arch
# build 64-bit (amd64) alternative library
GLIBC_MULTILIB_PASSES += amd64
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
