diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2013-11-25 11:38:01 -0800 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2013-11-25 11:38:01 -0800 |
| commit | 67ea2c9a69598edc6487c4b68942ab7b6bb27ad9 (patch) | |
| tree | 57b90553b7283bad8e288dc054a1de4391488341 /nptl | |
| parent | 63cfe52b6d85b83ad5907484c048fc20f9b783fd (diff) | |
Fix intermittent failure in tst-getpid2.
2013-11-25 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #11214]
* Makefile (tst-getpid2-ENV): New variable.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/Makefile | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0ee4523876..779843d17f 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2013-11-25 Paul Pluzhnikov <ppluzhnikov@google.com> + + [BZ #11214] + * Makefile (tst-getpid2-ENV): New variable. + 2013-11-20 Paul Pluzhnikov <ppluzhnikov@google.com> * Makefile (tst-cleanup2, tst-cleanupx2): Add -fno-builtin diff --git a/nptl/Makefile b/nptl/Makefile index 82f2d0a4f4..0fbfc4d3b4 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -447,6 +447,11 @@ tst-cancel7-ARGS = --command "exec $(host-test-program-cmd)" tst-cancelx7-ARGS = $(tst-cancel7-ARGS) tst-umask1-ARGS = $(objpfx)tst-umask1.temp +# In this test, we create a CLONE_VM "thread" that shares TLS storage +# with the original thread. Both threads then race in ld.so with lazy PLT +# resolution. Avoid this race by disabling lazy binding. BZ #11214. +tst-getpid2-ENV = LD_BIND_NOW=1 + $(objpfx)tst-atfork2: $(libdl) $(shared-thread-library) LDFLAGS-tst-atfork2 = -rdynamic tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace |