glibc: updated to 2.28-1

This commit is contained in:
Fredrik Rinnestam 2018-10-23 17:53:10 +02:00
parent 0be875beed
commit cc315315d8
5 changed files with 124 additions and 17962 deletions

View File

@ -10,53 +10,51 @@ lrwxrwxrwx root/root etc/localtime -> ../usr/share/zoneinfo/UTC
-rw-r--r-- root/root etc/resolv.conf
-rw-r--r-- root/root etc/rpc
drwxr-xr-x root/root lib/
-rwxr-xr-x root/root lib/ld-2.27.so
lrwxrwxrwx root/root lib/ld-linux-x86-64.so.2 -> ld-2.27.so
-rwxr-xr-x root/root lib/libBrokenLocale-2.27.so
lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.27.so
-rwxr-xr-x root/root lib/ld-2.28.so
lrwxrwxrwx root/root lib/ld-linux-x86-64.so.2 -> ld-2.28.so
-rwxr-xr-x root/root lib/libBrokenLocale-2.28.so
lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.28.so
-rwxr-xr-x root/root lib/libSegFault.so
-rwxr-xr-x root/root lib/libanl-2.27.so
lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.27.so
-rwxr-xr-x root/root lib/libc-2.27.so
lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.27.so
-rwxr-xr-x root/root lib/libcidn-2.27.so
lrwxrwxrwx root/root lib/libcidn.so.1 -> libcidn-2.27.so
-rwxr-xr-x root/root lib/libcrypt-2.27.so
lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.27.so
-rwxr-xr-x root/root lib/libdl-2.27.so
lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.27.so
-rwxr-xr-x root/root lib/libm-2.27.so
lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.27.so
-rwxr-xr-x root/root lib/libanl-2.28.so
lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.28.so
-rwxr-xr-x root/root lib/libc-2.28.so
lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.28.so
-rwxr-xr-x root/root lib/libcrypt-2.28.so
lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.28.so
-rwxr-xr-x root/root lib/libdl-2.28.so
lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.28.so
-rwxr-xr-x root/root lib/libm-2.28.so
lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.28.so
-rwxr-xr-x root/root lib/libmemusage.so
-rwxr-xr-x root/root lib/libmvec-2.27.so
lrwxrwxrwx root/root lib/libmvec.so.1 -> libmvec-2.27.so
-rwxr-xr-x root/root lib/libnsl-2.27.so
lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.27.so
-rwxr-xr-x root/root lib/libnss_compat-2.27.so
lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.27.so
-rwxr-xr-x root/root lib/libnss_db-2.27.so
lrwxrwxrwx root/root lib/libnss_db.so.2 -> libnss_db-2.27.so
-rwxr-xr-x root/root lib/libnss_dns-2.27.so
lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.27.so
-rwxr-xr-x root/root lib/libnss_files-2.27.so
lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.27.so
-rwxr-xr-x root/root lib/libnss_hesiod-2.27.so
lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.27.so
-rwxr-xr-x root/root lib/libnss_nis-2.27.so
lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.27.so
-rwxr-xr-x root/root lib/libnss_nisplus-2.27.so
lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.27.so
-rwxr-xr-x root/root lib/libmvec-2.28.so
lrwxrwxrwx root/root lib/libmvec.so.1 -> libmvec-2.28.so
-rwxr-xr-x root/root lib/libnsl-2.28.so
lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.28.so
-rwxr-xr-x root/root lib/libnss_compat-2.28.so
lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.28.so
-rwxr-xr-x root/root lib/libnss_db-2.28.so
lrwxrwxrwx root/root lib/libnss_db.so.2 -> libnss_db-2.28.so
-rwxr-xr-x root/root lib/libnss_dns-2.28.so
lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.28.so
-rwxr-xr-x root/root lib/libnss_files-2.28.so
lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.28.so
-rwxr-xr-x root/root lib/libnss_hesiod-2.28.so
lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.28.so
-rwxr-xr-x root/root lib/libnss_nis-2.28.so
lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.28.so
-rwxr-xr-x root/root lib/libnss_nisplus-2.28.so
lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.28.so
-rwxr-xr-x root/root lib/libpcprofile.so
-rwxr-xr-x root/root lib/libpthread-2.27.so
lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.27.so
-rwxr-xr-x root/root lib/libresolv-2.27.so
lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.27.so
-rwxr-xr-x root/root lib/librt-2.27.so
lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.27.so
-rwxr-xr-x root/root lib/libpthread-2.28.so
lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.28.so
-rwxr-xr-x root/root lib/libresolv-2.28.so
lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.28.so
-rwxr-xr-x root/root lib/librt-2.28.so
lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.28.so
-rwxr-xr-x root/root lib/libthread_db-1.0.so
lrwxrwxrwx root/root lib/libthread_db.so.1 -> libthread_db-1.0.so
-rwxr-xr-x root/root lib/libutil-2.27.so
lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.27.so
-rwxr-xr-x root/root lib/libutil-2.28.so
lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.28.so
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/ldconfig
-rwxr-xr-x root/root sbin/sln
@ -79,7 +77,6 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/sprof
-rwxr-xr-x root/root usr/bin/xtrace
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/_G_config.h
-rw-r--r-- root/root usr/include/a.out.h
-rw-r--r-- root/root usr/include/aio.h
-rw-r--r-- root/root usr/include/aliases.h
@ -196,9 +193,7 @@ drwxr-xr-x root/root usr/include/asm/
-rw-r--r-- root/root usr/include/asm/vsyscall.h
-rw-r--r-- root/root usr/include/assert.h
drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/_G_config.h
-rw-r--r-- root/root usr/include/bits/a.out.h
-rw-r--r-- root/root usr/include/bits/byteswap-16.h
-rw-r--r-- root/root usr/include/bits/byteswap.h
-rw-r--r-- root/root usr/include/bits/cmathcalls.h
-rw-r--r-- root/root usr/include/bits/confname.h
@ -227,6 +222,7 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/getopt_posix.h
-rw-r--r-- root/root usr/include/bits/hwcap.h
-rw-r--r-- root/root usr/include/bits/in.h
-rw-r--r-- root/root usr/include/bits/indirect-return.h
-rw-r--r-- root/root usr/include/bits/initspin.h
-rw-r--r-- root/root usr/include/bits/inotify.h
-rw-r--r-- root/root usr/include/bits/ioctl-types.h
@ -235,8 +231,6 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/ipctypes.h
-rw-r--r-- root/root usr/include/bits/iscanonical.h
-rw-r--r-- root/root usr/include/bits/libc-header-start.h
-rw-r--r-- root/root usr/include/bits/libio-ldbl.h
-rw-r--r-- root/root usr/include/bits/libio.h
-rw-r--r-- root/root usr/include/bits/libm-simd-decl-stubs.h
-rw-r--r-- root/root usr/include/bits/link.h
-rw-r--r-- root/root usr/include/bits/local_lim.h
@ -245,6 +239,7 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/math-finite.h
-rw-r--r-- root/root usr/include/bits/math-vector.h
-rw-r--r-- root/root usr/include/bits/mathcalls-helper-functions.h
-rw-r--r-- root/root usr/include/bits/mathcalls-narrow.h
-rw-r--r-- root/root usr/include/bits/mathcalls.h
-rw-r--r-- root/root usr/include/bits/mathdef.h
-rw-r--r-- root/root usr/include/bits/mathinline.h
@ -295,6 +290,7 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/stat.h
-rw-r--r-- root/root usr/include/bits/statfs.h
-rw-r--r-- root/root usr/include/bits/statvfs.h
-rw-r--r-- root/root usr/include/bits/statx.h
-rw-r--r-- root/root usr/include/bits/stdint-intn.h
-rw-r--r-- root/root usr/include/bits/stdint-uintn.h
-rw-r--r-- root/root usr/include/bits/stdio-ldbl.h
@ -324,12 +320,16 @@ drwxr-xr-x root/root usr/include/bits/
drwxr-xr-x root/root usr/include/bits/types/
-rw-r--r-- root/root usr/include/bits/types/FILE.h
-rw-r--r-- root/root usr/include/bits/types/__FILE.h
-rw-r--r-- root/root usr/include/bits/types/__fpos64_t.h
-rw-r--r-- root/root usr/include/bits/types/__fpos_t.h
-rw-r--r-- root/root usr/include/bits/types/__locale_t.h
-rw-r--r-- root/root usr/include/bits/types/__mbstate_t.h
-rw-r--r-- root/root usr/include/bits/types/__sigset_t.h
-rw-r--r-- root/root usr/include/bits/types/__sigval_t.h
-rw-r--r-- root/root usr/include/bits/types/clock_t.h
-rw-r--r-- root/root usr/include/bits/types/clockid_t.h
-rw-r--r-- root/root usr/include/bits/types/cookie_io_functions_t.h
-rw-r--r-- root/root usr/include/bits/types/error_t.h
-rw-r--r-- root/root usr/include/bits/types/locale_t.h
-rw-r--r-- root/root usr/include/bits/types/mbstate_t.h
-rw-r--r-- root/root usr/include/bits/types/res_state.h
@ -339,10 +339,12 @@ drwxr-xr-x root/root usr/include/bits/types/
-rw-r--r-- root/root usr/include/bits/types/sigset_t.h
-rw-r--r-- root/root usr/include/bits/types/sigval_t.h
-rw-r--r-- root/root usr/include/bits/types/stack_t.h
-rw-r--r-- root/root usr/include/bits/types/struct_FILE.h
-rw-r--r-- root/root usr/include/bits/types/struct_iovec.h
-rw-r--r-- root/root usr/include/bits/types/struct_itimerspec.h
-rw-r--r-- root/root usr/include/bits/types/struct_osockaddr.h
-rw-r--r-- root/root usr/include/bits/types/struct_rusage.h
-rw-r--r-- root/root usr/include/bits/types/struct_sched_param.h
-rw-r--r-- root/root usr/include/bits/types/struct_sigstack.h
-rw-r--r-- root/root usr/include/bits/types/struct_timespec.h
-rw-r--r-- root/root usr/include/bits/types/struct_timeval.h
@ -355,7 +357,6 @@ drwxr-xr-x root/root usr/include/bits/types/
-rw-r--r-- root/root usr/include/bits/uio-ext.h
-rw-r--r-- root/root usr/include/bits/uio_lim.h
-rw-r--r-- root/root usr/include/bits/unistd.h
-rw-r--r-- root/root usr/include/bits/ustat.h
-rw-r--r-- root/root usr/include/bits/utmp.h
-rw-r--r-- root/root usr/include/bits/utmpx.h
-rw-r--r-- root/root usr/include/bits/utsname.h
@ -437,7 +438,6 @@ drwxr-xr-x root/root usr/include/gnu/
-rw-r--r-- root/root usr/include/lastlog.h
-rw-r--r-- root/root usr/include/libgen.h
-rw-r--r-- root/root usr/include/libintl.h
-rw-r--r-- root/root usr/include/libio.h
-rw-r--r-- root/root usr/include/limits.h
-rw-r--r-- root/root usr/include/link.h
drwxr-xr-x root/root usr/include/linux/
@ -1265,14 +1265,12 @@ drwxr-xr-x root/root usr/include/rpc/
-rw-r--r-- root/root usr/include/rpc/auth_des.h
-rw-r--r-- root/root usr/include/rpc/auth_unix.h
-rw-r--r-- root/root usr/include/rpc/clnt.h
-rw-r--r-- root/root usr/include/rpc/des_crypt.h
-rw-r--r-- root/root usr/include/rpc/key_prot.h
-rw-r--r-- root/root usr/include/rpc/netdb.h
-rw-r--r-- root/root usr/include/rpc/pmap_clnt.h
-rw-r--r-- root/root usr/include/rpc/pmap_prot.h
-rw-r--r-- root/root usr/include/rpc/pmap_rmt.h
-rw-r--r-- root/root usr/include/rpc/rpc.h
-rw-r--r-- root/root usr/include/rpc/rpc_des.h
-rw-r--r-- root/root usr/include/rpc/rpc_msg.h
-rw-r--r-- root/root usr/include/rpc/svc.h
-rw-r--r-- root/root usr/include/rpc/svc_auth.h
@ -1440,7 +1438,6 @@ drwxr-xr-x root/root usr/include/sys/
-rw-r--r-- root/root usr/include/sys/un.h
-rw-r--r-- root/root usr/include/sys/unistd.h
-rw-r--r-- root/root usr/include/sys/user.h
-rw-r--r-- root/root usr/include/sys/ustat.h
-rw-r--r-- root/root usr/include/sys/utsname.h
-rw-r--r-- root/root usr/include/sys/vfs.h
-rw-r--r-- root/root usr/include/sys/vlimit.h
@ -1457,13 +1454,13 @@ drwxr-xr-x root/root usr/include/sys/
-rw-r--r-- root/root usr/include/termios.h
-rw-r--r-- root/root usr/include/tgmath.h
-rw-r--r-- root/root usr/include/thread_db.h
-rw-r--r-- root/root usr/include/threads.h
-rw-r--r-- root/root usr/include/time.h
-rw-r--r-- root/root usr/include/ttyent.h
-rw-r--r-- root/root usr/include/uchar.h
-rw-r--r-- root/root usr/include/ucontext.h
-rw-r--r-- root/root usr/include/ulimit.h
-rw-r--r-- root/root usr/include/unistd.h
-rw-r--r-- root/root usr/include/ustat.h
-rw-r--r-- root/root usr/include/utime.h
-rw-r--r-- root/root usr/include/utmp.h
-rw-r--r-- root/root usr/include/utmpx.h
@ -1756,13 +1753,12 @@ lrwxrwxrwx root/root usr/lib/libanl.so -> ../../lib/libanl.so.1
-rw-r--r-- root/root usr/lib/libc.a
-rw-r--r-- root/root usr/lib/libc.so
-rw-r--r-- root/root usr/lib/libc_nonshared.a
lrwxrwxrwx root/root usr/lib/libcidn.so -> ../../lib/libcidn.so.1
-rw-r--r-- root/root usr/lib/libcrypt.a
lrwxrwxrwx root/root usr/lib/libcrypt.so -> ../../lib/libcrypt.so.1
-rw-r--r-- root/root usr/lib/libdl.a
lrwxrwxrwx root/root usr/lib/libdl.so -> ../../lib/libdl.so.2
-rw-r--r-- root/root usr/lib/libg.a
-rw-r--r-- root/root usr/lib/libm-2.27.a
-rw-r--r-- root/root usr/lib/libm-2.28.a
-rw-r--r-- root/root usr/lib/libm.a
-rw-r--r-- root/root usr/lib/libm.so
-rw-r--r-- root/root usr/lib/libmcheck.a
@ -1779,8 +1775,7 @@ lrwxrwxrwx root/root usr/lib/libnss_hesiod.so -> ../../lib/libnss_hesiod.so.2
lrwxrwxrwx root/root usr/lib/libnss_nis.so -> ../../lib/libnss_nis.so.2
lrwxrwxrwx root/root usr/lib/libnss_nisplus.so -> ../../lib/libnss_nisplus.so.2
-rw-r--r-- root/root usr/lib/libpthread.a
-rw-r--r-- root/root usr/lib/libpthread.so
-rw-r--r-- root/root usr/lib/libpthread_nonshared.a
lrwxrwxrwx root/root usr/lib/libpthread.so -> ../../lib/libpthread.so.0
-rw-r--r-- root/root usr/lib/libresolv.a
lrwxrwxrwx root/root usr/lib/libresolv.so -> ../../lib/libresolv.so.2
-rw-r--r-- root/root usr/lib/librpcsvc.a
@ -2112,6 +2107,7 @@ drwxr-xr-x root/root usr/share/i18n/locales/
-rw-r--r-- root/root usr/share/i18n/locales/de_LU
-rw-r--r-- root/root usr/share/i18n/locales/de_LU@euro
-rw-r--r-- root/root usr/share/i18n/locales/doi_IN
-rw-r--r-- root/root usr/share/i18n/locales/dsb_DE
-rw-r--r-- root/root usr/share/i18n/locales/dv_MV
-rw-r--r-- root/root usr/share/i18n/locales/dz_BT
-rw-r--r-- root/root usr/share/i18n/locales/el_CY
@ -2295,6 +2291,7 @@ drwxr-xr-x root/root usr/share/i18n/locales/
-rw-r--r-- root/root usr/share/i18n/locales/ru_UA
-rw-r--r-- root/root usr/share/i18n/locales/rw_RW
-rw-r--r-- root/root usr/share/i18n/locales/sa_IN
-rw-r--r-- root/root usr/share/i18n/locales/sah_RU
-rw-r--r-- root/root usr/share/i18n/locales/sat_IN
-rw-r--r-- root/root usr/share/i18n/locales/sc_IT
-rw-r--r-- root/root usr/share/i18n/locales/sd_IN

View File

@ -1,10 +1,10 @@
untrusted comment: verify with /etc/ports/core.pub
RWRJc1FUaeVeqsFkXAV9/27rNaZYt+KNzYh2N87uUIik4oFP64b+kxnmI+cy+84zMiCYrkWkuPeE8aEbZ6LiNlO4lT+g4yDJJwU=
SHA256 (Pkgfile) = fede03277bd86a67ebf7a70938e906fe0a8d6f23cafb439a8913d210eda3aed6
SHA256 (.footprint) = 2f4762c10660a8702287287c8c818ab92c1e4bf4a6f9956e95ae21f83a2f8564
SHA256 (glibc-2.27.tar.xz) = 5172de54318ec0b7f2735e5a91d908afe1c9ca291fec16b5374d9faadfc1fc72
RWRJc1FUaeVeqkZbj9Od1oKlP+oic1n5+Ng6DRS9BzLNsQWlppxWVE8lIGJjl6qLQwdlyx3kdVbJrjorQxEyMDnWm2GHQDjh7QQ=
SHA256 (Pkgfile) = f38b7f9577a9b0cd0c12faafeefc7a9f86e6ea00560c49c4258cf35197f18688
SHA256 (.footprint) = d538bee0fe914b3ea6a1713b9fb66422c5807acff18cc458eb7187f6d650b45f
SHA256 (glibc-2.28.tar.xz) = b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082
SHA256 (linux-4.14.14.tar.xz) = 8b96362eb55ae152555980e7193fe2585b487176fb936cc69b8947d7dd32044a
SHA256 (glibc-2.27-2.patch) = 8387a85759afc94d66e0f318feea849b1c3cd1c4a883c0e5aaa246722ed3bcda
SHA256 (glibc-2.28-1.patch) = 41330a0a3b419087be7574a2da4b6c8d0921fd256eeb0d3f572a2b539d6c80ad
SHA256 (hosts) = 5c02b256c105f1d4a12fb738d71c1bab9eb126533074d7a0c8a14b92670c9431
SHA256 (resolv.conf) = 72ccb58768a72a771ec37142bc361a18478a07ec9de6e925a20760794389bf51
SHA256 (nsswitch.conf) = 859b8984e5e90aff3cce8f9779996ae4033b280d2122840e9411e2f44a1c2e61

View File

@ -3,11 +3,11 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=glibc
version=2.27
release=2
version=2.28
release=1
source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.14.tar.xz \
glibc-2.27-2.patch \
glibc-2.28-1.patch \
hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
build() {
@ -18,14 +18,14 @@ build() {
make INSTALL_HDR_PATH=$PKG/usr headers_install
chown root:root $PKG/usr
patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-$version-$release.patch
patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-$release.patch
mkdir $SRC/build
cd $SRC/build
../$name-${version}/configure --prefix=/usr \
--libexecdir=/usr/lib \
--with-headers=$PKG/usr/include \
--enable-kernel=3.12 \
--enable-kernel=4.9 \
--enable-add-ons \
--enable-static-nss \
--enable-stack-protector=strong \

File diff suppressed because it is too large Load Diff

60
glibc/glibc-2.28-1.patch Normal file
View File

@ -0,0 +1,60 @@
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"_