diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-09-13 10:29:43 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-09-13 10:29:43 +0200 |
| commit | 52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6 (patch) | |
| tree | 6017d46921703d11cf05f3fcaaf18e89df91a8dc | |
| parent | 995a80dfbcb443ead5aa22682c884ec5c827a2ea (diff) | |
| download | glibc-52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6.tar.gz glibc-52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6.tar.xz glibc-52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6.zip | |
Fix pattern on $(ldd-rewrite-script) substitution
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | elf/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 6fd8c36397..95b1fac64c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-09-13 Andreas Schwab <schwab@redhat.com> + * 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 a2d976ebc5..f20f52dee1 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 |