diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 16 | ||||
| -rw-r--r-- | elf/check-localplt.c | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/elf/Makefile b/elf/Makefile index fedbb20155..5cd78c2f83 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -828,11 +828,21 @@ check-data := $(firstword $(wildcard \ ifneq (,$(check-data)) tests: $(objpfx)check-localplt.out +ifeq ($(have-thread-library),yes) +thread-dso := $(filter-out %_nonshared.a, $(shared-thread-library)) +endif + $(objpfx)check-localplt.out: $(objpfx)check-localplt $(common-objpfx)libc.so \ - $(common-objpfx)math/libm.so $(check-data) + $(common-objpfx)math/libm.so $(thread-dso) \ + $(common-objpfx)rt/librt.so \ + $(common-objpfx)dlfcn/libdl.so \ + $(check-data) $(objpfx)check-localplt $(common-objpfx)libc.so \ - $(common-objpfx)math/libm.so | LC_ALL=C sort |\ - diff -u $(check-data) - + $(common-objpfx)math/libm.so $(thread-dso) \ + $(common-objpfx)rt/librt.so \ + $(common-objpfx)dlfcn/libdl.so | \ + LC_ALL=C sort | \ + diff -u $(check-data) - > $@ endif endif diff --git a/elf/check-localplt.c b/elf/check-localplt.c index 96a6cc0832..b4358a8a3f 100644 --- a/elf/check-localplt.c +++ b/elf/check-localplt.c @@ -212,7 +212,7 @@ AB(handle_file) (const char *fname, int fd) if (sym.st_value != 0) /* This symbol is locally defined. */ - puts (strtab + SWAP (sym.st_name)); + printf ("%s: %s\n", basename (fname), strtab + SWAP (sym.st_name)); } else for (E(Rel) *rel = relmem; (char *) rel - (char *) relmem < relsz; ++rel) @@ -230,7 +230,7 @@ AB(handle_file) (const char *fname, int fd) if (sym.st_value != 0) /* This symbol is locally defined. */ - puts (strtab + SWAP (sym.st_name)); + printf ("%s: %s\n", basename (fname), strtab + SWAP (sym.st_name)); } return 0; |