This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/erms/ifunc updated. glibc-2.23-146-g347e750
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 1 Apr 2016 13:26:10 -0000
- Subject: GNU C Library master sources branch hjl/erms/ifunc updated. glibc-2.23-146-g347e750
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/erms/ifunc has been updated
via 347e750ea39894550325e4514f24b68dd189d7d8 (commit)
from 0662f9c7caa5dccd62a7eea29e89c4f6aec6a5fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=347e750ea39894550325e4514f24b68dd189d7d8
commit 347e750ea39894550325e4514f24b68dd189d7d8
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Apr 1 06:25:50 2016 -0700
Fix MEMCPY_SYMBOL
diff --git a/sysdeps/x86_64/memmove.S b/sysdeps/x86_64/memmove.S
index a992583..5fb57e3 100644
--- a/sysdeps/x86_64/memmove.S
+++ b/sysdeps/x86_64/memmove.S
@@ -26,13 +26,19 @@
#define SECTION(p) p
-#ifndef MEMMOVE_SYMBOL
-# if defined SHARED && IS_IN (libc)
-# define MEMCPY_SYMBOL(p,s) __memcpy
-# else
+#if IS_IN (libc)
+# ifdef USE_MULTIARCH
# define MEMCPY_SYMBOL(p,s) memcpy
+# else
+# define MEMCPY_SYMBOL(p,s) __memcpy
# endif
+#else
+# define MEMCPY_SYMBOL(p,s) memcpy
+#endif
+#if !defined SHARED || !IS_IN (libc)
# define MEMPCPY_SYMBOL(p,s) __mempcpy
+#endif
+#ifndef MEMMOVE_SYMBOL
# define MEMMOVE_CHK_SYMBOL(p,s) p
# define MEMMOVE_SYMBOL(p,s) memmove
#endif
diff --git a/sysdeps/x86_64/multiarch/memmove.S b/sysdeps/x86_64/multiarch/memmove.S
index e3483de..521befe 100644
--- a/sysdeps/x86_64/multiarch/memmove.S
+++ b/sysdeps/x86_64/multiarch/memmove.S
@@ -80,10 +80,6 @@ libc_hidden_ver (__mempcpy_sse2_unaligned, __mempcpy)
by the indirect call in the PLT. */
# define libc_hidden_builtin_def
# else
-/* In static binaries we need memcpy and mempcpy before the initialization
- happened. */
-# define MEMCPY_SYMBOL(p,s) memcpy
-# define MEMPCPY_SYMBOL(p,s) __mempcpy
weak_alias (__mempcpy, mempcpy)
# endif
-----------------------------------------------------------------------
Summary of changes:
sysdeps/x86_64/memmove.S | 14 ++++++++++----
sysdeps/x86_64/multiarch/memmove.S | 4 ----
2 files changed, 10 insertions(+), 8 deletions(-)
hooks/post-receive
--
GNU C Library master sources