aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-30 23:14:33 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-30 23:14:33 +0000
commitdf61ffb2ac3dd24cd4d848f67abc8a6c18de9b06 (patch)
tree342d58ea55ed50d095c1aa712b180da7039fc812
parent09dec6c37e3cd967f62795320703647f24545e3e (diff)
downloadglibc-df61ffb2ac3dd24cd4d848f67abc8a6c18de9b06.tar
glibc-df61ffb2ac3dd24cd4d848f67abc8a6c18de9b06.tar.gz
glibc-df61ffb2ac3dd24cd4d848f67abc8a6c18de9b06.tar.bz2
glibc-df61ffb2ac3dd24cd4d848f67abc8a6c18de9b06.zip
Support cross-testing for elf/tst-array*.
-rw-r--r--ChangeLog11
-rw-r--r--elf/Makefile40
2 files changed, 27 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index e9a2794a53..b4fc747ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-30 Joseph Myers <joseph@codesourcery.com>
+
+ * elf/Makefile ($(objpfx)tst-array1.out): Depend on comparison
+ input. Use $(build-program-cmd).
+ ($(objpfx)tst-array1-static.out): Likewise.
+ ($(objpfx)tst-array2.out): Likewise.
+ ($(objpfx)tst-array3.out): Likewise.
+ ($(objpfx)tst-array4.out): Likewise.
+ ($(objpfx)tst-array5.out): Likewise.
+ ($(objpfx)tst-array5-static.out): Likewise.
+
2012-10-30 Chris Metcalf <cmetcalf@tilera.com>
* elf/dl-load.c (_dl_map_object_from_fd): Call DL_AFTER_LOAD
diff --git a/elf/Makefile b/elf/Makefile
index d583b94012..42b792bce8 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -846,45 +846,37 @@ LDFLAGS-tst-execstack-needed = -Wl,-z,noexecstack
LDFLAGS-tst-execstack-prog = -Wl,-z,execstack
endif
-$(objpfx)tst-array1.out: $(objpfx)tst-array1
- $(elf-objpfx)$(rtld-installed-name) \
- --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
- $(objpfx)tst-array1 > $@
+$(objpfx)tst-array1.out: tst-array1.exp $(objpfx)tst-array1
+ $(built-program-cmd) > $@
cmp $@ tst-array1.exp > /dev/null
-$(objpfx)tst-array1-static.out: $(objpfx)tst-array1-static
- $(objpfx)tst-array1-static > $@
+$(objpfx)tst-array1-static.out: tst-array1.exp $(objpfx)tst-array1-static
+ $(built-program-cmd) > $@
cmp $@ tst-array1.exp > /dev/null
$(objpfx)tst-array2: $(objpfx)tst-array2dep.so
-$(objpfx)tst-array2.out: $(objpfx)tst-array2
- $(elf-objpfx)$(rtld-installed-name) \
- --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
- $(objpfx)tst-array2 > $@
+$(objpfx)tst-array2.out: tst-array2.exp $(objpfx)tst-array2
+ $(built-program-cmd) > $@
cmp $@ tst-array2.exp > /dev/null
-$(objpfx)tst-array3.out: $(objpfx)tst-array3
- $(elf-objpfx)$(rtld-installed-name) \
- --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
- $(objpfx)tst-array3 > $@
+$(objpfx)tst-array3.out: tst-array1.exp $(objpfx)tst-array3
+ $(built-program-cmd) > $@
cmp $@ tst-array1.exp > /dev/null
$(objpfx)tst-array4: $(libdl)
-$(objpfx)tst-array4.out: $(objpfx)tst-array4 $(objpfx)tst-array2dep.so
- $(elf-objpfx)$(rtld-installed-name) \
- --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
- $< > $@
+$(objpfx)tst-array4.out: tst-array4.exp $(objpfx)tst-array4 \
+ $(objpfx)tst-array2dep.so
+ $(built-program-cmd) > $@
cmp $@ tst-array4.exp > /dev/null
$(objpfx)tst-array5: $(objpfx)tst-array5dep.so
-$(objpfx)tst-array5.out: $(objpfx)tst-array5
- $(elf-objpfx)$(rtld-installed-name) \
- --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
- $(objpfx)tst-array5 > $@
+$(objpfx)tst-array5.out: tst-array5.exp $(objpfx)tst-array5
+ $(built-program-cmd) > $@
cmp $@ tst-array5.exp > /dev/null
-$(objpfx)tst-array5-static.out: $(objpfx)tst-array5-static
- $(objpfx)tst-array5-static > $@
+$(objpfx)tst-array5-static.out: tst-array5-static.exp \
+ $(objpfx)tst-array5-static
+ $(built-program-cmd) > $@
cmp $@ tst-array5-static.exp > /dev/null
CFLAGS-tst-pie1.c += $(pie-ccflag)