From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Wed, 29 Nov 2017 03:00:21 +0000 (+0000)
Subject: unsubmitted-ldso-multilib
X-Git-Tag: archive/raspbian/2.25-3+rpi1~159
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0597b8ac6c469b33ba91b98a0b626a2b959b95cf;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 2763b66b3..5c8b87385 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1800,6 +1800,15 @@ open_verify (const char *name, int fd,
 	      *found_other_class = true;
 	      goto close_and_out;
 	    }
+#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.  */
+	      goto close_and_out;
+	    }
+#endif
 	  else if (ehdr->e_ident[EI_DATA] != byteorder)
 	    {
 	      if (BYTE_ORDER == BIG_ENDIAN)