Remove left over LD_LIBRARY_VERSION usages

System Internals / glibc - Adhemerval Zanella [linaro.org] - 4 August 2022 12:09 UTC

The environment variable was removed by d2db60d8d830ef68c8d20a77ac3572d610aa40b1.

###

diff --git a/sysdeps/unix/sysv/linux/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/ldd-rewrite.sed
index 7b8b6bdee0..1faa90fbc8 100644
--- a/sysdeps/unix/sysv/linux/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/ldd-rewrite.sed
@@ -8,4 +8,3 @@
fi\
# In case of an error punt.
/LD_TRACE_LOADED_OBJECTS=1/a\
-add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
diff --git a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
index 9039b69548..74bdbd9659 100644
--- a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
@@ -1,6 +1,3 @@
-/LD_TRACE_LOADED_OBJECTS=1/a\
-add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
-
# ldd is generated from elf/ldd.bash.in with the name
# of ld.so as generated in Makeconfig

diff --git a/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
index 6b4f1bfcad..ea2b5a05cf 100644
--- a/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
@@ -1,6 +1,3 @@
-/LD_TRACE_LOADED_OBJECTS=1/a\
-add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
-
# ldd is generated from elf/ldd.bash.in with the name
# of ld.so as generated in Makeconfig

diff --git a/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
index 7dc2698fa8..3ec8f49f42 100644
--- a/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
@@ -1,3 +1 @@
-/LD_TRACE_LOADED_OBJECTS=1/a\
-add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
s_^\(RTLDLIST=\)\(.*lib\)\(\|64\)\(/[^/]*\.so\.[0-9.]*\)[ ]*$_\1"\2\4 \264\4"_
diff --git a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
index 44d76e8aa1..49c0c7a3a8 100644
--- a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
@@ -1,3 +1 @@
-/LD_TRACE_LOADED_OBJECTS=1/a\
-add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out"
s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_

5a57ad23ba Remove left over LD_LIBRARY_VERSION usages
sysdeps/unix/sysv/linux/ldd-rewrite.sed | 1 -
sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed | 3 ---
sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed | 3 ---
sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed | 2 --
sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed | 2 --
5 files changed, 11 deletions(-)

Upstream: sourceware.org


  • Share