From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 3 Mar 2018 10:47:56 +0000 (+0000)
Subject: local-soname-hack
X-Git-Tag: archive/raspbian/2.27-1+rpi1^2~139
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c56ecf3692d4f56725045e2696442cf0a2a79bf;p=glibc.git

local-soname-hack

For backward compatibility with armhf binaries built with the
old linker SONAME, we need to fake out the linker to believe
the new is the old, until such a point as everything is rebuilt


Gbp-Pq: Topic arm
Gbp-Pq: Name local-soname-hack.diff
---

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 3ce99728f..381dc1ebc 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2092,10 +2092,13 @@ _dl_map_object (struct link_map *loader, const char *name,
 	  soname = ((const char *) D_PTR (l, l_info[DT_STRTAB])
 		    + l->l_info[DT_SONAME]->d_un.d_val);
 	  if (strcmp (name, soname) != 0)
+#ifdef __arm__
+            if (strcmp(name, "ld-linux.so.3") || strcmp(soname, "ld-linux-armhf.so.3"))
+#endif
 	    continue;
 
 	  /* We have a match on a new name -- cache it.  */
-	  add_name_to_object (l, soname);
+	  add_name_to_object (l, name);
 	  l->l_soname_added = 1;
 	}