about summary refs log tree commit diff
path: root/support/Makefile
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2018-10-04 13:07:29 +0200
committerStefan Liebler <stli@linux.ibm.com>2018-10-04 13:07:29 +0200
commite7624d708d12c608daf179d90c0d6de74c24dd2c (patch)
tree92913c933c88d70d1aa9c9abf7a3847c6a03689d /support/Makefile
parentdae3ed958c3d0090838e49ff4f78c201262b1cf0 (diff)
downloadglibc-e7624d708d12c608daf179d90c0d6de74c24dd2c.tar.gz
glibc-e7624d708d12c608daf179d90c0d6de74c24dd2c.tar.xz
glibc-e7624d708d12c608daf179d90c0d6de74c24dd2c.zip
Adjust name of ld.so in test-container.c.
The test-container.c file assumes that ld.so is always named
something like /elf/ld-linux-*.
But e.g. on s390x it is named ld64.so.1 or ld.so.1 on s390.
There are other architectures like power or mips with similar names.

This patch introduces the new global variable support_objdir_elf_ldso
which contains the absolute path to the runtime linker used by the
testsuite, e.g. OBJDIR_PATH/elf/ld-linux-x86-64.so.2.
The check in test-container.c is now comparing against this path.
Without this patch, test-container.c is searching invalid files / directories
and fails to find glibc/nss/tst-nss-test3.root/tst-nss-test3.script.
Then the test tst-nss-test3 fails!

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

ChangeLog:

	* support/support.h (support_objdir_elf_ldso): New variable.
	* support/support_paths.c (support_objdir_elf_ldso): Likewise.
	* support/Makefile (CFLAGS-support_paths.c): Add definition
	for OBJDIR_ELF_LDSO_PATH.
	* support/test-container.c (main): Search for the ld.so
	which is also used by the testsuite.
Diffstat (limited to 'support/Makefile')
-rw-r--r--support/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/support/Makefile b/support/Makefile
index 545bfa2727..8b4a7bf8c5 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -160,6 +160,7 @@ endif
 CFLAGS-support_paths.c = \
 		-DSRCDIR_PATH=\"`cd .. ; pwd`\" \
 		-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
+		-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
 		-DINSTDIR_PATH=\"$(prefix)\" \
 		-DLIBDIR_PATH=\"$(libdir)\"