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-147-g99de0cf
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 1 Apr 2016 14:02:35 -0000
- Subject: GNU C Library master sources branch hjl/erms/ifunc updated. glibc-2.23-147-g99de0cf
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 99de0cfe1aee515b07cb57d48bd4e710db84da5c (commit)
from 347e750ea39894550325e4514f24b68dd189d7d8 (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=99de0cfe1aee515b07cb57d48bd4e710db84da5c
commit 99de0cfe1aee515b07cb57d48bd4e710db84da5c
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Apr 1 07:02:18 2016 -0700
Memmove
diff --git a/sysdeps/x86_64/memmove.S b/sysdeps/x86_64/memmove.S
index 5fb57e3..a90cec1 100644
--- a/sysdeps/x86_64/memmove.S
+++ b/sysdeps/x86_64/memmove.S
@@ -26,16 +26,18 @@
#define SECTION(p) p
-#if IS_IN (libc)
-# ifdef USE_MULTIARCH
+#ifdef USE_MULTIARCH
+# if !defined SHARED || !IS_IN (libc)
# define MEMCPY_SYMBOL(p,s) memcpy
-# else
-# define MEMCPY_SYMBOL(p,s) __memcpy
# endif
#else
-# define MEMCPY_SYMBOL(p,s) memcpy
+# if defined SHARED && IS_IN (libc)
+# define MEMCPY_SYMBOL(p,s) __memcpy
+# else
+# define MEMCPY_SYMBOL(p,s) memcpy
+# endif
#endif
-#if !defined SHARED || !IS_IN (libc)
+#if !defined SHARED || !defined USE_MULTIARCH || !IS_IN (libc)
# define MEMPCPY_SYMBOL(p,s) __mempcpy
#endif
#ifndef MEMMOVE_SYMBOL
diff --git a/sysdeps/x86_64/multiarch/memmove.S b/sysdeps/x86_64/multiarch/memmove.S
index 521befe..17d24c1 100644
--- a/sysdeps/x86_64/multiarch/memmove.S
+++ b/sysdeps/x86_64/multiarch/memmove.S
@@ -79,11 +79,12 @@ libc_hidden_ver (__mempcpy_sse2_unaligned, __mempcpy)
The speedup we get from using SSE2 instructions is likely eaten away
by the indirect call in the PLT. */
# define libc_hidden_builtin_def
-# else
-weak_alias (__mempcpy, mempcpy)
# endif
-
strong_alias (__libc_memmove, memmove)
#endif
+#ifdef SHARED
+weak_alias (__mempcpy, mempcpy)
+#endif
+
#include "../memmove.S"
-----------------------------------------------------------------------
Summary of changes:
sysdeps/x86_64/memmove.S | 14 ++++++++------
sysdeps/x86_64/multiarch/memmove.S | 7 ++++---
2 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources