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 8a89b71016d426796e602b60555696649871c6ae..dfb4b7d031f93a9dcc8312e1469fb568ef0ebf93 100644 (file)
--- 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)