1 diff -Nrup a/nptl/Makefile b/nptl/Makefile
2 --- a/nptl/Makefile 2012-06-05 07:42:49.000000000 -0600
3 +++ b/nptl/Makefile 2012-06-07 12:15:21.816318678 -0600
4 @@ -529,15 +529,19 @@ $(addprefix $(objpfx), \
5 $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
6 $(objpfx)libpthread_nonshared.a
7 $(objpfx)tst-unload: $(libdl)
8 -# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
9 +# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
10 # since otherwise libpthread.so comes before libc.so when linking.
11 $(addprefix $(objpfx), $(tests-reverse)): \
12 - $(objpfx)../libc.so $(objpfx)libpthread.so \
13 + $(objpfx)linklibc.so $(objpfx)libpthread.so \
14 $(objpfx)libpthread_nonshared.a
15 $(objpfx)../libc.so: $(common-objpfx)libc.so ;
16 $(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
18 $(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
20 +$(objpfx)linklibc.so: $(common-objpfx)libc.so
22 +generated += libclink.so
24 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a