r5720 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/any patches/hurd-i386
Author: sthibault
Date: 2013-10-10 06:39:05 +0000 (Thu, 10 Oct 2013)
New Revision: 5720
Added:
glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-NO_HIDDEN.diff
Removed:
glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series
Log:
Rename patches/any/unsubmitted-multi_arch.diff into
patches/hurd-i386/unsubmitted-NO_HIDDEN.diff: make it use ifndef NO_HIDDEN
instead of ifdef USE_MULTIARCH, __GI_* stuff is about hidden symbols, not
multiarch.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-10 05:34:03 UTC (rev 5719)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-10 06:39:05 UTC (rev 5720)
@@ -55,8 +55,8 @@
* patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Add missing
version.
* patches/hurd-i386/libpthread_hurd_cond_wait.diff: Likewise.
- * patches/any/unsubmitted-multi_arch.diff: New patch, fixes undefined
- reference failure with non-multiarch builds.
+ * patches/hurd-i386/unsubmitted-NO_HIDDEN.diff: New patch, fixes undefined
+ __GI_memmove/memset reference failures.
-- Adam Conrad <adconrad@ubuntu.com> Sun, 25 Aug 2013 14:59:44 -0600
Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff 2013-10-10 05:34:03 UTC (rev 5719)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff 2013-10-10 06:39:05 UTC (rev 5720)
@@ -1,19 +0,0 @@
-This only applies for builds with multiarch enabled.
-
----
- symbol-hacks.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: eglibc-2.18/sysdeps/generic/symbol-hacks.h
-===================================================================
---- eglibc-2.18.orig/sysdeps/generic/symbol-hacks.h 2013-06-15 17:37:04.000000000 +0000
-+++ eglibc-2.18/sysdeps/generic/symbol-hacks.h 2013-10-09 23:31:32.000000000 +0000
-@@ -1,6 +1,9 @@
- /* Some compiler optimizations may transform loops into memset/memmove
- calls and without proper declaration it may generate PLT calls. */
- #if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED
-+#include <config.h>
-+# if defined USE_MULTIARCH
- asm ("memmove = __GI_memmove");
- asm ("memset = __GI_memset");
-+# endif
- #endif
Copied: glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-NO_HIDDEN.diff (from rev 5718, glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-multi_arch.diff)
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-NO_HIDDEN.diff (rev 0)
+++ glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/unsubmitted-NO_HIDDEN.diff 2013-10-10 06:39:05 UTC (rev 5720)
@@ -0,0 +1,26 @@
+hurd-i386 defines NO_HIDDEN, thus __GI_* versions are not available.
+
+This was introduced by
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=15605
+
+Since Debian glibc is built with -O2, we shouldn't actually have the issue, but
+we should try not to define NO_HIDDEN
+
+---
+ symbol-hacks.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Index: eglibc-2.18/sysdeps/generic/symbol-hacks.h
+===================================================================
+--- eglibc-2.18.orig/sysdeps/generic/symbol-hacks.h 2013-06-15 17:37:04.000000000 +0000
++++ eglibc-2.18/sysdeps/generic/symbol-hacks.h 2013-10-10 06:28:31.000000000 +0000
+@@ -1,6 +1,9 @@
+ /* Some compiler optimizations may transform loops into memset/memmove
+ calls and without proper declaration it may generate PLT calls. */
+ #if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED
++#include <config.h>
++# if !defined NO_HIDDEN
+ asm ("memmove = __GI_memmove");
+ asm ("memset = __GI_memset");
++# endif
+ #endif
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-10 05:34:03 UTC (rev 5719)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-10-10 06:39:05 UTC (rev 5720)
@@ -127,6 +127,7 @@
hurd-i386/unsubmitted-clock_t_centiseconds.diff
hurd-i386/submitted-startup-pid2.diff
hurd-i386/submitted-path_mounted.diff
+hurd-i386/unsubmitted-NO_HIDDEN.diff
i386/local-biarch.diff
i386/local-cmov.diff
@@ -234,4 +235,3 @@
any/local-tst-eintr1-eagain.diff
any/unsubmitted-ldso-machine-mismatch.diff
any/cvs-tst-tls-atexit-deps.diff
-any/unsubmitted-multi_arch.diff
Reply to: