61 lines
2.6 KiB
Diff
61 lines
2.6 KiB
Diff
diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure
|
|
index 27d50e1d3c..290670a67a 100644
|
|
--- a/sysdeps/unix/sysv/linux/aarch64/configure
|
|
+++ b/sysdeps/unix/sysv/linux/aarch64/configure
|
|
@@ -6,10 +6,10 @@ arch_minimum_kernel=3.7.0
|
|
test -n "$libc_cv_slibdir" ||
|
|
case "$prefix" in
|
|
/usr | /usr/)
|
|
- libc_cv_slibdir='/lib64'
|
|
+ libc_cv_slibdir='/lib'
|
|
libc_cv_rtlddir='/lib'
|
|
if test "$libdir" = '${exec_prefix}/lib'; then
|
|
- libdir='${exec_prefix}/lib64';
|
|
+ libdir='${exec_prefix}/lib';
|
|
# Locale data can be shared between 32-bit and 64-bit libraries.
|
|
libc_cv_complocaledir='${exec_prefix}/lib/locale'
|
|
fi
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/configure b/sysdeps/unix/sysv/linux/x86_64/64/configure
|
|
index 9d298faba7..cef1ec842c 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/64/configure
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/64/configure
|
|
@@ -4,10 +4,10 @@
|
|
test -n "$libc_cv_slibdir" ||
|
|
case "$prefix" in
|
|
/usr | /usr/)
|
|
- libc_cv_slibdir='/lib64'
|
|
- libc_cv_rtlddir='/lib64'
|
|
+ libc_cv_slibdir='/lib'
|
|
+ libc_cv_rtlddir='/lib'
|
|
if test "$libdir" = '${exec_prefix}/lib'; then
|
|
- libdir='${exec_prefix}/lib64';
|
|
+ libdir='${exec_prefix}/lib';
|
|
# Locale data can be shared between 32-bit and 64-bit libraries.
|
|
libc_cv_complocaledir='${exec_prefix}/lib/locale'
|
|
fi
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/ldconfig.h b/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
|
|
index c7e9ad674d..cd47995d4a 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
|
|
@@ -18,9 +18,9 @@
|
|
#include <sysdeps/generic/ldconfig.h>
|
|
|
|
#define SYSDEP_KNOWN_INTERPRETER_NAMES \
|
|
- { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
|
|
+ { "/lib32/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
|
|
{ "/libx32/ld-linux-x32.so.2", FLAG_ELF_LIBC6 }, \
|
|
- { "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
|
|
+ { "/lib/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
|
|
#define SYSDEP_KNOWN_LIBRARY_NAMES \
|
|
{ "libc.so.6", FLAG_ELF_LIBC6 }, \
|
|
{ "libm.so.6", FLAG_ELF_LIBC6 },
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
|
|
index 44d76e8aa1..7d6cb1e20b 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
|
|
@@ -1,3 +1,3 @@
|
|
/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"_
|
|
+s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\232\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_
|