diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-10-24 09:10:52 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-10-24 09:10:52 +0200 |
| commit | aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2 (patch) | |
| tree | 503b3da15cbdb76448aeedbfd0707dbcafa755ff /nptl | |
| parent | 1b0eb3e0a50411a48717b3e3412bd7ccbca284ee (diff) | |
| parent | 3a8db22f07e2ab5373d4a366672a7a7b158ada96 (diff) | |
| download | glibc-aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2.tar glibc-aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2.tar.gz glibc-aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2.tar.bz2 glibc-aec22f45f4b7ec2d5d6bf2abcd696788bd17eba2.zip | |
Merge branch 'master' into aj/shared-linux-fcntl
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 12 | ||||
| -rw-r--r-- | nptl/Makefile | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6154e61c67..2743631da4 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,15 @@ +2012-10-23 Joseph Myers <joseph@codesourcery.com> + + * Makefile [$(cross-compiling) = no]: Change condition to + [$(run-built-tests) = yes]. + +2012-10-23 Jim Blandy <jimb@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * Makefile (tst-cancel7-ARGS): Use $(host-built-program-cmd). + (tst-exec4-ARGS): Likewise. + (tst-stackguard1-ARGS): Likewise. + 2012-10-21 Jim Blandy <jimb@codesourcery.com> Joseph Myers <joseph@codesourcery.com> diff --git a/nptl/Makefile b/nptl/Makefile index bc563f8969..02db930b6c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -439,7 +439,7 @@ CFLAGS-tst-initializers1-c99.c = $(CFLAGS-tst-initializers1-<) CFLAGS-tst-initializers1-gnu89.c = $(CFLAGS-tst-initializers1-<) CFLAGS-tst-initializers1-gnu99.c = $(CFLAGS-tst-initializers1-<) -tst-cancel7-ARGS = --command "$(built-program-cmd)" +tst-cancel7-ARGS = --command "$(host-built-program-cmd)" tst-cancelx7-ARGS = $(tst-cancel7-ARGS) tst-umask1-ARGS = $(objpfx)tst-umask1.temp @@ -448,7 +448,7 @@ LDFLAGS-tst-atfork2 = -rdynamic tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace $(objpfx)tst-atfork2mod.so: $(shared-thread-library) -ifeq ($(cross-compiling),no) +ifeq ($(run-built-tests),yes) tests: $(objpfx)tst-stack3-mem endif tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace @@ -472,7 +472,7 @@ LDFLAGS-tst-tls5 = $(no-as-needed) LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so ifeq ($(build-shared),yes) -ifeq ($(cross-compiling),no) +ifeq ($(run-built-tests),yes) tests: $(objpfx)tst-tls6.out endif $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \ @@ -583,7 +583,7 @@ generated += banner.h LDFLAGS-pthread.so += -e __nptl_main endif -ifeq (no,$(cross-compiling)) +ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) tests: $(objpfx)tst-cancel-wrappers.out $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh @@ -595,7 +595,7 @@ $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh endif endif -tst-exec4-ARGS = $(built-program-cmd) +tst-exec4-ARGS = $(host-built-program-cmd) $(objpfx)tst-execstack: $(libdl) $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so @@ -603,7 +603,7 @@ LDFLAGS-tst-execstack = -Wl,-z,noexecstack $(objpfx)tst-fini1mod.so: $(shared-thread-library) -tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" +tst-stackguard1-ARGS = --command "$(host-built-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" # The tests here better do not run in parallel |