summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-10-08 01:37:46 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-10-08 01:37:46 +0200
commitc176f168fd96a017ff741f82d9ee14996b8a1215 (patch)
treeb6c6efbd90a6aedda682dafdd47044df184730ce
parent58695b88a9deaecbcf7794760cc333177edaa2b4 (diff)
Do not use __GI_* symbols
hurd-i386 defines NO_HIDDEN, thus __GI_* versions are not available. This was introduced by https://sourceware.org/bugzilla/show_bug.cgi?id=15605 When building with -O2, we shouldn't actually have the issue, but we should try not to define NO_HIDDEN
-rw-r--r--.topdeps2
-rw-r--r--.topmsg17
-rw-r--r--sysdeps/generic/symbol-hacks.h3
3 files changed, 9 insertions, 13 deletions
diff --git a/.topdeps b/.topdeps
index df7c3c6e56..180b47c18b 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-9a869d822025be8e43b78234997b10bf0cf9d859
+baseline
diff --git a/.topmsg b/.topmsg
index dd6634c886..bac2208e5c 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,16 +1,9 @@
-Subject: Baseline for our topic branches.
+hurd-i386 defines NO_HIDDEN, thus __GI_* versions are not available.
----
+This was introduced by
-This need not strictly be a TopGit branch, but it is for easy synchronization
-between different machines.
+https://sourceware.org/bugzilla/show_bug.cgi?id=15605
-As the baseline is merged into the topic branches, it is forward-only.
+When building with -O2, we shouldn't actually have the issue, but we
+should try not to define NO_HIDDEN
-To advance it:
-
- $ echo [SHA1] > .topdeps
- $ git commit -m Advance. -- .topdeps
- $ tg update
-
----
diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h
index 9eaf014ff2..fe99289a4b 100644
--- a/sysdeps/generic/symbol-hacks.h
+++ b/sysdeps/generic/symbol-hacks.h
@@ -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