9c4147
--- glibc-2.18-151-g303e567.orig/elf/ldconfig.c	2013-09-25 14:01:01.522446341 -0400
9c4147
+++ glibc-2.18-151-g303e567/elf/ldconfig.c	2013-09-25 14:06:31.094218857 -0400
9c4147
@@ -959,6 +959,16 @@
9c4147
 				|| dlib_ptr->flag == FLAG_ELF_LIBC6)
9c4147
 			       && flag == FLAG_ELF)
9c4147
 			dlib_ptr->flag = flag;
9c4147
+#ifdef __arm__
9c4147
+		      /* In Fedora 20 binutils regressed temporarily and failed to
9c4147
+			 mark hard ABI objects with the correct flag. Therefore we
9c4147
+			 must accept unmarked objects that were previously marked
9c4147
+			 hard ABI. We can remove this check once the entire distribution
9c4147
+			 has been rebuilt.  */
9c4147
+		      else if (dlib_ptr->flag & FLAG_ARM_LIBHF &&
9c4147
+			       (flag == FLAG_ELF_LIBC6))
9c4147
+			;
9c4147
+#endif
9c4147
 		      else
9c4147
 			error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."),
9c4147
 			       dlib_ptr->name, direntry->d_name,