This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-189-gc1b0aad
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Nov 2014 13:49:01 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-189-gc1b0aad
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, master has been updated
via c1b0aadcdfd1b4b56588856cdc3197f4f145677d (commit)
from bf438382bd8ffcc614b01e9a273a577b3ed54f9f (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=c1b0aadcdfd1b4b56588856cdc3197f4f145677d
commit c1b0aadcdfd1b4b56588856cdc3197f4f145677d
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Nov 14 13:48:39 2014 +0000
Fix build of C mempcpy and stpcpy.
This patch fixes the build of C mempcpy and stpcpy by disabling the
redirection to __mempcpy and __stpcpy asm names if
NO_MEMPCPY_STPCPY_REDIRECT is defined, and defining that macro in the
relevant source files.
Tested for powerpc32 that the build is fixed.
* include/string.h [NO_MEMPCPY_STPCPY_REDIRECT] (mempcpy): Do not
redeclare with asm name.
[NO_MEMPCPY_STPCPY_REDIRECT] (stpcpy): Likewise.
* string/mempcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Define before
including <string.h>.
* string/stpcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
* sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
[!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
* sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
[!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
* sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
[SHARED && !NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
diff --git a/ChangeLog b/ChangeLog
index caf1ce9..8448f28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2014-11-14 Joseph Myers <joseph@codesourcery.com>
+
+ * include/string.h [NO_MEMPCPY_STPCPY_REDIRECT] (mempcpy): Do not
+ redeclare with asm name.
+ [NO_MEMPCPY_STPCPY_REDIRECT] (stpcpy): Likewise.
+ * string/mempcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Define before
+ including <string.h>.
+ * string/stpcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+ * sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
+ [!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+ * sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
+ [!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+ * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
+ [SHARED && !NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+
2014-11-13 Joseph Myers <joseph@codesourcery.com>
* stdlib/strtol.c (__strtol): Use prototype definition.
diff --git a/include/string.h b/include/string.h
index 99cc2d3..172940b 100644
--- a/include/string.h
+++ b/include/string.h
@@ -115,7 +115,8 @@ libc_hidden_builtin_proto (strspn)
libc_hidden_builtin_proto (strstr)
libc_hidden_builtin_proto (ffs)
-#if defined NOT_IN_libc || !defined SHARED
+#if (defined NOT_IN_libc || !defined SHARED) \
+ && !defined NO_MEMPCPY_STPCPY_REDIRECT
/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
__mempcpy and __stpcpy if not inlined. */
extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
diff --git a/string/mempcpy.c b/string/mempcpy.c
index 9749863..aab1bed 100644
--- a/string/mempcpy.c
+++ b/string/mempcpy.c
@@ -19,6 +19,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define NO_MEMPCPY_STPCPY_REDIRECT
#include <string.h>
#undef mempcpy
diff --git a/string/stpcpy.c b/string/stpcpy.c
index fc5ae55..9185acc 100644
--- a/string/stpcpy.c
+++ b/string/stpcpy.c
@@ -19,6 +19,7 @@
# include <config.h>
#endif
+#define NO_MEMPCPY_STPCPY_REDIRECT
#include <string.h>
#undef __stpcpy
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
index 38fbcc3..89f4912 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
+# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
index 38fbcc3..89f4912 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
+# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
index c7118d5..28153b7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#if defined SHARED && !defined NOT_IN_libc
+# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 15 +++++++++++++++
include/string.h | 3 ++-
string/mempcpy.c | 1 +
string/stpcpy.c | 1 +
.../powerpc/powerpc32/power4/multiarch/mempcpy.c | 1 +
sysdeps/powerpc/powerpc64/multiarch/mempcpy.c | 1 +
sysdeps/powerpc/powerpc64/multiarch/stpcpy.c | 1 +
7 files changed, 22 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources