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 fcb39a78d4a19e41c4326f5ecbdc8795cf343182..333ad358054e19d3907084ffd79c8c7bb58b7668 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1706,6 +1706,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)