| 1 | diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure |
| 2 | index 27d50e1d3c..290670a67a 100644 |
| 3 | --- a/sysdeps/unix/sysv/linux/aarch64/configure |
| 4 | +++ b/sysdeps/unix/sysv/linux/aarch64/configure |
| 5 | @@ -6,10 +6,10 @@ arch_minimum_kernel=3.7.0 |
| 6 | test -n "$libc_cv_slibdir" || |
| 7 | case "$prefix" in |
| 8 | /usr | /usr/) |
| 9 | - libc_cv_slibdir='/lib64' |
| 10 | + libc_cv_slibdir='/lib' |
| 11 | libc_cv_rtlddir='/lib' |
| 12 | if test "$libdir" = '${exec_prefix}/lib'; then |
| 13 | - libdir='${exec_prefix}/lib64'; |
| 14 | + libdir='${exec_prefix}/lib'; |
| 15 | # Locale data can be shared between 32-bit and 64-bit libraries. |
| 16 | libc_cv_complocaledir='${exec_prefix}/lib/locale' |
| 17 | fi |
| 18 | diff --git a/sysdeps/unix/sysv/linux/x86_64/64/configure b/sysdeps/unix/sysv/linux/x86_64/64/configure |
| 19 | index 9d298faba7..cef1ec842c 100644 |
| 20 | --- a/sysdeps/unix/sysv/linux/x86_64/64/configure |
| 21 | +++ b/sysdeps/unix/sysv/linux/x86_64/64/configure |
| 22 | @@ -4,10 +4,10 @@ |
| 23 | test -n "$libc_cv_slibdir" || |
| 24 | case "$prefix" in |
| 25 | /usr | /usr/) |
| 26 | - libc_cv_slibdir='/lib64' |
| 27 | - libc_cv_rtlddir='/lib64' |
| 28 | + libc_cv_slibdir='/lib' |
| 29 | + libc_cv_rtlddir='/lib' |
| 30 | if test "$libdir" = '${exec_prefix}/lib'; then |
| 31 | - libdir='${exec_prefix}/lib64'; |
| 32 | + libdir='${exec_prefix}/lib'; |
| 33 | # Locale data can be shared between 32-bit and 64-bit libraries. |
| 34 | libc_cv_complocaledir='${exec_prefix}/lib/locale' |
| 35 | fi |
| 36 | diff --git a/sysdeps/unix/sysv/linux/x86_64/ldconfig.h b/sysdeps/unix/sysv/linux/x86_64/ldconfig.h |
| 37 | index c7e9ad674d..cd47995d4a 100644 |
| 38 | --- a/sysdeps/unix/sysv/linux/x86_64/ldconfig.h |
| 39 | +++ b/sysdeps/unix/sysv/linux/x86_64/ldconfig.h |
| 40 | @@ -18,9 +18,9 @@ |
| 41 | #include <sysdeps/generic/ldconfig.h> |
| 42 | |
| 43 | #define SYSDEP_KNOWN_INTERPRETER_NAMES \ |
| 44 | - { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \ |
| 45 | + { "/lib32/ld-linux.so.2", FLAG_ELF_LIBC6 }, \ |
| 46 | { "/libx32/ld-linux-x32.so.2", FLAG_ELF_LIBC6 }, \ |
| 47 | - { "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 }, |
| 48 | + { "/lib/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 }, |
| 49 | #define SYSDEP_KNOWN_LIBRARY_NAMES \ |
| 50 | { "libc.so.6", FLAG_ELF_LIBC6 }, \ |
| 51 | { "libm.so.6", FLAG_ELF_LIBC6 }, |
| 52 | diff --git a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed |
| 53 | index 44d76e8aa1..7d6cb1e20b 100644 |
| 54 | --- a/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed |
| 55 | +++ b/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed |
| 56 | @@ -1,3 +1,3 @@ |
| 57 | /LD_TRACE_LOADED_OBJECTS=1/a\ |
| 58 | add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" |
| 59 | -s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ |
| 60 | +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\232\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_ |