summaryrefslogtreecommitdiff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2017-07-29 00:02:03 -0400
committerCarlos O'Donell <carlos@redhat.com>2017-07-29 00:02:03 -0400
commit5920a4a624b1f4db310d1c44997b640e2a4653e5 (patch)
treee58989b49f6aae484bcdf13adad65bdbe79273e3 /nptl/Makefile
parentd95fcb2df478efbf4f8537ba898374043ac4561f (diff)
mutex: Fix robust mutex lock acquire (Bug 21778)
65810f0ef05e8c9e333f17a44e77808b163ca298 fixed a robust mutex bug but introduced BZ 21778: if the CAS used to try to acquire a lock fails, the expected value is not updated, which breaks other cases in the loce acquisition loop. The fix is to simply update the expected value with the value returned by the CAS, which ensures that behavior is as if the first case with the CAS never happened (if the CAS fails). This is a regression introduced in the last release. Tested on x86_64, i686, ppc64, ppc64le, s390x, aarch64, armv7hl.
Diffstat (limited to 'nptl/Makefile')
-rw-r--r--nptl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 7e54684a36..5cb1bb2c3d 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -230,7 +230,7 @@ LDLIBS-tst-thread_local1 = -lstdc++
tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
- tst-mutex7 tst-mutex9 tst-mutex5a tst-mutex7a \
+ tst-mutex7 tst-mutex9 tst-mutex5a tst-mutex7a tst-mutex7robust \
tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 tst-mutexpi5 \
tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \
tst-mutexpi9 \