[PATCH 50/94] Revert "sys-libs/glibc: fix symlink for x86 ld.so on Hurd"

This reverts commit 02e24cbf17f6a3b8bd33d136e6bb0c57820a5bca.

I was wrong! I was confused by a symlink that we still had in the
setup script for an image.

Compare the following:
* gcc/config/i386/gnu64.h:28:#define GNU_USER_DYNAMIC_LINKER64 "/lib/ld-x86-64.so.1"
vs
* gcc/config/i386/gnu.h:25:#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"

The inconsistency is weird here though, as in gnu64.h, there's also:
* gcc/config/i386/gnu64.h:27:#define GNU_USER_DYNAMIC_LINKER32 "/lib/ld.so.1"

but I think this shouldn't matter as we don't plan to do multilib.

Signed-off-by: Sam James <[email protected]>
---
 sys-libs/glibc/glibc-2.42-r5.ebuild | 2 +-
 sys-libs/glibc/glibc-2.43.ebuild    | 2 +-
 sys-libs/glibc/glibc-9999.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.42-r5.ebuild b/sys-libs/glibc/glibc-2.42-r5.ebuild
index 2094a5f76a6f8..b85dd9ecfdfa0 100644
--- a/sys-libs/glibc/glibc-2.42-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.42-r5.ebuild
@@ -1510,7 +1510,7 @@ glibc_do_src_install() {
 		local ldso_abi_list=(
 			# x86
 			amd64   /lib64/ld-x86-64.so.1
-			x86     /lib/ld.so.1
+			x86     /lib/ld.so
 		)
 	fi
 	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
diff --git a/sys-libs/glibc/glibc-2.43.ebuild b/sys-libs/glibc/glibc-2.43.ebuild
index 80f7083f882d8..a84ae1e4630b3 100644
--- a/sys-libs/glibc/glibc-2.43.ebuild
+++ b/sys-libs/glibc/glibc-2.43.ebuild
@@ -1534,7 +1534,7 @@ glibc_do_src_install() {
 		local ldso_abi_list=(
 			# x86
 			amd64   /lib64/ld-x86-64.so.1
-			x86     /lib/ld.so.1
+			x86     /lib/ld.so
 		)
 	fi
 	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index d3f5048fec5b8..9e678b1a7ec81 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1534,7 +1534,7 @@ glibc_do_src_install() {
 		local ldso_abi_list=(
 			# x86
 			amd64   /lib64/ld-x86-64.so.1
-			x86     /lib/ld.so.1
+			x86     /lib/ld.so
 		)
 	fi
 	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-- 
2.53.0