From: Andreas Schwab Date: Tue, 13 Sep 2011 08:29:43 +0000 (+0200) Subject: Fix pattern on $(ldd-rewrite-script) substitution X-Git-Tag: glibc-2.15~295 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6;p=thirdparty%2Fglibc.git Fix pattern on $(ldd-rewrite-script) substitution --- diff --git a/ChangeLog b/ChangeLog index 6fd8c363975..95b1fac64c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-09-13 Andreas Schwab + * elf/Makefile (gen-ldd): Fix pattern. + * elf/rtld.c (dl_main): Only use USE___THREAD when defined. (init_tls): Likewise. diff --git a/elf/Makefile b/elf/Makefile index a2d976ebc54..f20f52dee1e 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -483,7 +483,7 @@ endef else define gen-ldd LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< \ -| LC_ALL=C sed -f $(patsubst $(..)/,/,$(..)$(ldd-rewrite-script)) > $@.new +| LC_ALL=C sed -f $(patsubst $(..)/%,/%,$(..)$(ldd-rewrite-script)) > $@.new endef endif