From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Tue, 23 Jul 2024 17:09:58 +0000 (+0200)
Subject: unsubmitted-ldso-multilib
X-Git-Tag: archive/raspbian/2.40-2+rpi1^2^2~63
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c7bb934214e899b2de8ce31fabf2389491de3203;p=glibc.git

unsubmitted-ldso-multilib


Gbp-Pq: Topic arm
Gbp-Pq: Name unsubmitted-ldso-multilib.diff
---

diff --git a/elf/dl-load.c b/elf/dl-load.c
index ce8fdea30..7764e4723 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1700,6 +1700,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)