summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-10-08 01:38:36 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-10-08 01:38:36 +0200
commit26588252cfde777ab7c9b483365f4b39a10774bc (patch)
tree51457084b95fac157212ee79d6c60a5a6f9a7373
parent71d1d30224f88d6b0b72d04f6868fdd2f0f2ec11 (diff)
parentc176f168fd96a017ff741f82d9ee14996b8a1215 (diff)
Merge branch 't/NO_HIDDEN' into refs/top-bases/tschwinge/Roger_Whittaker
-rw-r--r--sysdeps/generic/symbol-hacks.h3
1 files changed, 3 insertions, 0 deletions
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