aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-20 23:06:56 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-20 23:06:56 +0000
commit1ddf537f074f453f4d8b70c1b5df3f9ac728bec4 (patch)
tree53bd0b17132f0b094107e7decca8a1ad39008526 /elf
parent0695b00cef7d8349bc16e61e62189f185926fdff (diff)
downloadglibc-1ddf537f074f453f4d8b70c1b5df3f9ac728bec4.tar
glibc-1ddf537f074f453f4d8b70c1b5df3f9ac728bec4.tar.gz
glibc-1ddf537f074f453f4d8b70c1b5df3f9ac728bec4.tar.bz2
glibc-1ddf537f074f453f4d8b70c1b5df3f9ac728bec4.zip
Update.
1998-08-20 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile (sh-ldd-rewrite): Remove expression to remove BASH-ONLY marked region. * elf/ldd.bash.in: Remove special BASH-ONLY markers. 1998-02-20 17:54 H.J. Lu <hjl@gnu.org> * libio/oldfileops.c (_IO_file_seekoff): Don't adjust pointers if _IO_SYSSEEK fails. * libio/iolibio.h (_IO_pos_BAD): Define of type _IO_fpos64_t. * libio/oldfileops.c (FILEBUF_LITERAL): Also initialize new _offset element.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile3
-rw-r--r--elf/ldd.bash.in2
2 files changed, 1 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 3771ffb685..5cc13b2bc0 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -166,8 +166,7 @@ $(inst_slibdir)/$(rtld-installed-name): \
common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
-e 's%@VERSION@%$(version)%g'
-sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g' \
- -e 's/\$$"/"/g;/^\#\#\#BASH-ONLY/,/\#\#\#END-BASH-ONLY/d'
+sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g;s/\$$"/"/g'
bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \
-e 's%@TEXTDOMAINDIR@%$(localedir)%g'
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index f0d50e4430..f6ffa6b4e8 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -24,11 +24,9 @@
# run-time dynamic linker as a command and setting the environment
# variable LD_TRACE_LOADED_OBJECTS to a non-empty value.
-###BASH-ONLY
# We should be able to find the translation right at the beginning.
TEXTDOMAIN=libc
TEXTDOMAINDIR=@TEXTDOMAINDIR@
-###END-BASH-ONLY
RTLD=@RTLD@
warn=