This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Fix testroot.pristine creation copying dynamic linker
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Cc: <dj at redhat dot com>
- Date: Wed, 16 Oct 2019 21:51:31 +0000
- Subject: Fix testroot.pristine creation copying dynamic linker
- Ironport-sdr: nN+z3FL8jLDsdfMK5Qng/7FVvCVRQA2xsLzNHlG6cVTtpBpdCuzdkLJvo99sjqh8iXxTUm3rt1 6vKnB7wM1Nue/VcSrdhijwJZAF+v5S1EdlYcqTdo+RjWFPfAlpYsMOOhS7e2/McxPg9UHRKfQs 30/xLghWLQKtJloBLL4Ggm8a78MvISj9B/sNyqHN1Jnfj4Q7AcgXdFGUO1BXyZnM777mAhalrK +ydCa7jMYr7Wr2t4Il5WlIVITsdo0Ow+jefqRMWE7O9MTZ1R6QGyOBqIKfiZblIjKuikzAjr3G dLk=
- Ironport-sdr: WJ47kLJLXrxSqVtYT55lTJ/jsHydl4kQ0hIi/Iafp5NyCBXso6ZeKc+DzElpfxnp0K0kY7+/ut YnWhQQMYDd38v7tuy8IpEXUwD1sN3mfVtvc1NN8o0aj8enZzHASMXSU9pL/6g6Tgw3OKzPLrn7 wHO/+17Ew/tLfl3/EDW/A25WFwOw6tamkEHx8nl1JN//H+qfJ6Glt5NRnPBLnN5nkI71bWiFHo qzR2EEwDm74PU0y52fwVoxFl5zodK7ZMgGAr+jmwObvYwUDY4+3g6kOqShXT/YDimD+nfIsEDz OkM=
This patch addresses an issue reported in
<https://sourceware.org/ml/libc-alpha/2019-07/msg00661.html> where the
creation of testroot.pristine, on encountering
LD_TRACE_LOADED_OBJECTS=1 of the form
libc.so.6 => /scratch/jmyers/glibc/mbs/obj/glibc-8-0-mips64-linux-gnu-x86_64-linux-gnu/default/libc.so.6 (0x772dd000)
/lib32/ld.so.1 => /scratch/jmyers/glibc/mbs/obj/glibc-8-0-mips64-linux-gnu-x86_64-linux-gnu/default/elf/ld.so.1 (0x7747b000)
tries to copy /lib32/ld.so.1 (which does not exist) into the testroot
instead of copying the path on the RHS of "=>", which does exist,
because the Makefile logic assumes that the path on such a line with
'/' should be copied, when if there are such paths on both the LHS and
the RHS of "=>", only the one on the RHS necessarily exists and so
only that should be copied. The patch follows the approach suggested
by DJ in <https://sourceware.org/ml/libc-alpha/2019-07/msg00662.html>.
Tested for x86_64, with and without --enable-hardcoded-path-in-tests;
also previously tested for MIPS, with and without
--enable-hardcoded-path-in-tests, to confirm it fixes the original
problem.
Co-authored-by: DJ Delorie <dj@redhat.com>
diff --git a/Makefile b/Makefile
index a736c3afcc..b16b82d3e1 100644
--- a/Makefile
+++ b/Makefile
@@ -555,7 +555,7 @@ ifeq ($(run-built-tests),yes)
for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \
$(rtld-prefix) \
$(objpfx)testroot.pristine/bin/sh \
- | grep / | sed 's/^[^/]*//' | sed 's/ .*//'` ;\
+ | grep / | sed 's@.*=> /@/@' | sed 's/^[^/]*//' | sed 's/ .*//'` ;\
do \
test -d `dirname $(objpfx)testroot.pristine$$dso` || \
mkdir -p `dirname $(objpfx)testroot.pristine$$dso` ;\
@@ -564,7 +564,7 @@ ifeq ($(run-built-tests),yes)
for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \
$(rtld-prefix) \
$(objpfx)support/$(LINKS_DSO_PROGRAM) \
- | grep / | sed 's/^[^/]*//' | sed 's/ .*//'` ;\
+ | grep / | sed 's@.*=> /@/@' | sed 's/^[^/]*//' | sed 's/ .*//'` ;\
do \
test -d `dirname $(objpfx)testroot.pristine$$dso` || \
mkdir -p `dirname $(objpfx)testroot.pristine$$dso` ;\
--
Joseph S. Myers
joseph@codesourcery.com