From 098d196d9e730e806d3efe04c56a84743a45bec8 Mon Sep 17 00:00:00 2001
From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sun, 25 Aug 2024 20:16:17 +0200
Subject: [PATCH] unsubmitted-ldso-multilib

Gbp-Pq: Topic arm
Gbp-Pq: Name unsubmitted-ldso-multilib.diff
---
 elf/dl-load.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8a89b7101..dfb4b7d03 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1655,6 +1655,17 @@ open_verify (const char *name, int fd,
 	      __set_errno (ENOENT);
 	      return -1;
 	    }
+#ifdef __arm__
+          else if (!VALID_FLOAT_ABI (ehdr->e_flags))
+	    {
+	      /* This is not a fatal error.  On architectures where
+		 soft-float and hard-float binaries can be run this
+		 might happen.  */
+	      __close_nocancel (fd);
+	      __set_errno (ENOENT);
+	      return -1;
+	    }
+#endif
 	  else if (ehdr->e_ident[EI_DATA] != byteorder)
 	    {
 	      if (BYTE_ORDER == BIG_ENDIAN)
-- 
2.30.2