From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Mon, 13 Jul 2020 19:34:17 +0000 (+0100)
Subject: unsubmitted-ldso-machine-mismatch
X-Git-Tag: archive/raspbian/2.31-1+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=03496a4ecdff420757296d74e0cc4d8e7787fcd3;p=glibc.git

unsubmitted-ldso-machine-mismatch


Gbp-Pq: Topic any
Gbp-Pq: Name unsubmitted-ldso-machine-mismatch.diff
---

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 020fce0cc..581e5d573 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1621,6 +1621,12 @@ open_verify (const char *name, int fd,
 	      goto close_and_out;
 	    }
 #endif
+	  else if (! __builtin_expect (elf_machine_matches_host (ehdr), 1))
+	    {
+	      /* Another non-fatal error, let's skip right past the
+	         the libraries obviously built for other machines.  */
+	      goto close_and_out;
+	    }
 	  else if (ehdr->e_ident[EI_DATA] != byteorder)
 	    {
 	      if (BYTE_ORDER == BIG_ENDIAN)