r5451 - glibc-package/branches/eglibc-2.17/debian/patches/arm
Author: adconrad
Date: 2013-01-24 03:57:56 +0000 (Thu, 24 Jan 2013)
New Revision: 5451
Modified:
glibc-package/branches/eglibc-2.17/debian/patches/arm/unsubmitted-ldso-multilib.diff
Log:
Drop the found_other_class bit from arm/unsubmitted-ldso-multilib.diff, that's 32/64 specific
Modified: glibc-package/branches/eglibc-2.17/debian/patches/arm/unsubmitted-ldso-multilib.diff
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/arm/unsubmitted-ldso-multilib.diff 2013-01-24 02:46:06 UTC (rev 5450)
+++ glibc-package/branches/eglibc-2.17/debian/patches/arm/unsubmitted-ldso-multilib.diff 2013-01-24 03:57:56 UTC (rev 5451)
@@ -1,6 +1,6 @@
--- glibc/elf/dl-load.c 2013-01-23 19:29:03.412797023 -0700
+++ glibc/elf/dl-load.c 2013-01-23 19:30:02.556794931 -0700
-@@ -1999,6 +2000,16 @@
+@@ -1999,6 +2000,15 @@
*found_other_class = true;
goto close_and_out;
}
@@ -10,7 +10,6 @@
+ /* This is not a fatal error. On architectures where
+ soft-float and hard-float binaries can be run this
+ might happen. */
-+ *found_other_class = true;
+ goto close_and_out;
+ }
+#endif
Reply to: