From 5c43ec8cb64b6848ef21b36b62263521c2ed5208 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Aug 29 2017 10:51:29 +0000 Subject: Drop glibc-rh1009145.patch It has since been obsoleted by multiple mass rebuilds. --- diff --git a/glibc-rh1009145.patch b/glibc-rh1009145.patch deleted file mode 100644 index c1af7fa..0000000 --- a/glibc-rh1009145.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- glibc-2.18-151-g303e567.orig/elf/ldconfig.c 2013-09-25 14:01:01.522446341 -0400 -+++ glibc-2.18-151-g303e567/elf/ldconfig.c 2013-09-25 14:06:31.094218857 -0400 -@@ -959,6 +959,16 @@ - || dlib_ptr->flag == FLAG_ELF_LIBC6) - && flag == FLAG_ELF) - dlib_ptr->flag = flag; -+#ifdef __arm__ -+ /* In Fedora 20 binutils regressed temporarily and failed to -+ mark hard ABI objects with the correct flag. Therefore we -+ must accept unmarked objects that were previously marked -+ hard ABI. We can remove this check once the entire distribution -+ has been rebuilt. */ -+ else if (dlib_ptr->flag & FLAG_ARM_LIBHF && -+ (flag == FLAG_ELF_LIBC6)) -+ ; -+#endif - else - error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."), - dlib_ptr->name, direntry->d_name, diff --git a/glibc.spec b/glibc.spec index e40fb98..528f212 100644 --- a/glibc.spec +++ b/glibc.spec @@ -210,10 +210,6 @@ Patch0033: glibc-fedora-elf-ORIGIN.patch # Support mangling and demangling null pointers. Patch0037: glibc-rh952799.patch -# ARM: Accept that some objects marked hard ABI are now not because of a -# binutils bug. -Patch0044: glibc-rh1009145.patch - # Allow applications to call pthread_atfork without libpthread.so. Patch0046: glibc-rh1013801.patch @@ -783,7 +779,6 @@ microbenchmark tests on the system. %patch0031 -p1 %patch0033 -p1 %patch0037 -p1 -%patch0044 -p1 %patch0046 -p1 %patch2031 -p1 %patch0047 -p1