diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2012-10-10 12:17:27 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2012-10-10 12:52:56 +0530 |
| commit | 0e3b5d6a6859d74a18033d3a55e0ee92340437b3 (patch) | |
| tree | b4f8c7fe139fb80e4fba77409942b68942a5df48 /nptl/Makefile | |
| parent | f96f12423a1b801f4a198f2568e29e85bd9cc473 (diff) | |
| download | glibc-0e3b5d6a6859d74a18033d3a55e0ee92340437b3.tar.gz glibc-0e3b5d6a6859d74a18033d3a55e0ee92340437b3.tar.xz glibc-0e3b5d6a6859d74a18033d3a55e0ee92340437b3.zip | |
Take lock in pthread_cond_wait cleanup handler only when needed
[BZ #14652] When a thread waiting in pthread_cond_wait with a PI mutex is cancelled after it has returned successfully from the futex syscall but just before async cancellation is disabled, it enters its cancellation handler with the mutex held and simply calling a mutex_lock again will result in a deadlock. Hence, it is necessary to see if the thread owns the lock and try to lock it only if it doesn't.
Diffstat (limited to 'nptl/Makefile')
| -rw-r--r-- | nptl/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 67c262794f..184057b572 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -206,7 +206,7 @@ tests = tst-typesizes \ tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \ tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \ tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \ - tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 \ + tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 tst-cond25 \ tst-cond-except \ tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \ tst-robust6 tst-robust7 tst-robust8 tst-robust9 \ @@ -276,6 +276,7 @@ gen-as-const-headers = pthread-errnos.sym LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst LDFLAGS-tst-cond24 = -lrt +LDFLAGS-tst-cond25 = -lrt include ../Makeconfig |