Fix intermittent failure in tst-getpid2.

2013-11-25  Paul Pluzhnikov  <ppluzhnikov@google.com>

	[BZ #11214]
	* Makefile (tst-getpid2-ENV): New variable.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 0ee4523876964105740b355f42edeee95a9180ea..779843d17fe2adbbb5ac7c3314dc5246939ef117 100644 (file)
--- 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 82f2d0a4f48950860c89e8e76e7567dfc72621ba..0fbfc4d3b47780f4c320d0f503a9f144b317040b 100644 (file)
--- 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