From 4788a2f558863acc578e31ae971759a7154b69bd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 7 May 2016 05:01:37 +0000
Subject: [PATCH] core/glibc: drop patch

---
 core/glibc/PKGBUILD               |  8 --------
 core/glibc/local-soname-hack.diff | 18 ------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 core/glibc/local-soname-hack.diff

diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 35ab347a1..ae4183923 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -29,22 +29,14 @@ backup=(etc/gai.conf
 options=('!strip' 'staticlibs' '!distcc')
 install=glibc.install
 source=(git://sourceware.org/git/glibc.git#commit=${_commit}
-        local-soname-hack.diff
         locale.gen.txt
         locale-gen)
 md5sums=('SKIP'
-         '905370139382428ef2b97b247c0970bf'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
 
 prepare() {
   mkdir glibc-build
-
-  cd ${pkgname}
-  # ALARM: patch for hard-float ld-linux soname
-  if [[ $CARCH == "armv6h" || $CARCH == "armv7h" ]]; then
-    patch -p1 -i ${srcdir}/local-soname-hack.diff
-  fi
 }
 
 build() {
diff --git a/core/glibc/local-soname-hack.diff b/core/glibc/local-soname-hack.diff
deleted file mode 100644
index da7ab04ce..000000000
--- a/core/glibc/local-soname-hack.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN a/elf/dl-load.c b/elf/dl-load.c
---- a/elf/dl-load.c	2013-08-10 16:52:55.000000000 -0600
-+++ b/elf/dl-load.c	2014-01-17 12:25:32.482819996 -0700
-@@ -2105,10 +2105,13 @@
- 	  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;
- 	}
-