diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/Makefile | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 194dcc39a3..def7f2c3ac 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2012-04-28 Andreas Schwab <schwab@linux-m68k.org> + + * Makefile ($(objpfx)tst-stack3-mem, $(objpfx)tst-tls6.out): Don't + run when cross-compiling. + 2012-04-26 Siddhesh Poyarekar <siddhesh@redhat.com> * sysdeps/pthread/unwind-forcedunwind.c: Include gnu/lib-names.h diff --git a/nptl/Makefile b/nptl/Makefile index 52277dd843..09acd8a481 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -438,7 +438,9 @@ LDFLAGS-tst-atfork2 = -rdynamic tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace $(objpfx)tst-atfork2mod.so: $(shared-thread-library) +ifeq ($(cross-compiling),no) tests: $(objpfx)tst-stack3-mem +endif tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace $(objpfx)tst-stack3-mem: $(objpfx)tst-stack3.out $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@ @@ -459,7 +461,9 @@ $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so ifeq ($(build-shared),yes) +ifeq ($(cross-compiling),no) tests: $(objpfx)tst-tls6.out +endif $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ $(objpfx)tst-tls5moda.so $(objpfx)tst-tls5modb.so \ $(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \ |