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.21-52-g1016993
- From: azanella at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Feb 2015 13:21:25 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-52-g1016993
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 10169938b14dbceaa29e4c3deccc15b9a6869ef9 (commit)
via 8548a53d699399e795a70e066401753622d797e3 (commit)
via b269211467795c71ae0ceb0ce79f2fb6614f33c9 (commit)
via 18e270aada9d267679e7b0308a37684cfe3633b4 (commit)
via 6f0993a6387158aac2b1b7ff6f8e4ffd75877d2a (commit)
via 3001e54c5786f714537acfb631b502e2229f883f (commit)
from 59b61c82fe18e612058302e4c726385c4eb301d8 (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=10169938b14dbceaa29e4c3deccc15b9a6869ef9
commit 10169938b14dbceaa29e4c3deccc15b9a6869ef9
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Wed Jan 21 07:57:14 2015 -0500
powerpc: wordcopy/memmove cleanup for ppc32
This patch cleanup some multiarch code related to memmmove
optimization. Initial IFUNC support added specialized wordcopy
symbols which turned in local IFUNC calls used by memmove default
implementation. The patch removes the internal IFUNC for wordcopy
symbols and uses local branches in the memmmove optimization instead.
diff --git a/ChangeLog b/ChangeLog
index e849606..3e7ce52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,18 @@
2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
+ [sysdep_routines]: Remove wordcopy-power6 object.
+ * sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c
+ (__memmove_power7): Use local call for wordcopy and memcpy symbols.
+ * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c
+ (__memmove_ppc32): Likewise.
+ * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c: Remove
+ file.
+ * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c: Remove file.
+ * sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c [IS_IN (libc)]:
+ Remove preprocessor.
+
+ * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
[sysdep_routines]: Remove wide chars objects.
[wcsmbs]: New rule for wide char objects.
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
index 2271d57..bd9d360 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
@@ -9,7 +9,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \
strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \
strchr-power7 strchr-ppc32 \
- wordcopy-power7 wordcopy-power6 wordcopy-ppc32 \
+ wordcopy-power7 wordcopy-ppc32 \
memmove-power7 memmove-ppc
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c
index 8f2614d..5a7fc5f 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c
@@ -17,6 +17,17 @@
not, see <http://www.gnu.org/licenses/>. */
#include <string.h>
+#include <memcopy.h>
+
+extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7;
+extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7;
+extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7;
+extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7;
+
+#define _wordcopy_fwd_aligned _wordcopy_fwd_aligned_power7
+#define _wordcopy_fwd_dest_aligned _wordcopy_fwd_dest_aligned_power7
+#define _wordcopy_bwd_aligned _wordcopy_bwd_aligned_power7
+#define _wordcopy_bwd_dest_aligned _wordcopy_bwd_dest_aligned_power7
extern __typeof (memcpy) __memcpy_power7;
#define memcpy __memcpy_power7
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c
index d7ba5a8..b543a8a 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c
@@ -17,6 +17,17 @@
not, see <http://www.gnu.org/licenses/>. */
#include <string.h>
+#include <memcopy.h>
+
+extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc;
+extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc;
+extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc;
+extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc;
+
+#define _wordcopy_fwd_aligned _wordcopy_fwd_aligned_ppc
+#define _wordcopy_fwd_dest_aligned _wordcopy_fwd_dest_aligned_ppc
+#define _wordcopy_bwd_aligned _wordcopy_bwd_aligned_ppc
+#define _wordcopy_bwd_dest_aligned _wordcopy_bwd_dest_aligned_ppc
extern __typeof (memcpy) __memcpy_ppc;
#define memcpy __memcpy_ppc
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c
deleted file mode 100644
index 65dd8c8..0000000
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_power6
-#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_power6
-#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_power6
-#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_power6
-
-#include <sysdeps/powerpc/power6/wordcopy.c>
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c
index 41e4118..82af17c 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c
@@ -15,9 +15,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_ppc
-#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_ppc
-#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_ppc
-#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_ppc
+#if IS_IN (libc)
+# define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_ppc
+# define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_ppc
+# define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_ppc
+# define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_ppc
-#include <sysdeps/powerpc/power4/wordcopy.c>
+# include <sysdeps/powerpc/power4/wordcopy.c>
+#else
+# include <string/wordcopy.c>
+#endif
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c
deleted file mode 100644
index cc27540..0000000
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Multiple versions of wordcopy functions.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#if IS_IN (libc)
-# include <stddef.h>
-# include <memcopy.h>
-# include <shlib-compat.h>
-# include "init-arch.h"
-
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6
-attribute_hidden;
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7
-attribute_hidden;
-
-libc_ifunc (_wordcopy_fwd_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_fwd_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_fwd_aligned_power6
- : _wordcopy_fwd_aligned_ppc);
-
-
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6
-attribute_hidden;
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7
-attribute_hidden;
-
-libc_ifunc (_wordcopy_fwd_dest_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_fwd_dest_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_fwd_dest_aligned_power6
- : _wordcopy_fwd_dest_aligned_ppc);
-
-
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6
-attribute_hidden;
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7
-attribute_hidden;
-
-libc_ifunc (_wordcopy_bwd_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_bwd_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_bwd_aligned_power6
- : _wordcopy_bwd_aligned_ppc);
-
-
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6
-attribute_hidden;
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7
-attribute_hidden;
-
-libc_ifunc (_wordcopy_bwd_dest_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_bwd_dest_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_bwd_dest_aligned_power6
- : _wordcopy_bwd_dest_aligned_ppc);
-
-#else
-#include <sysdeps/powerpc/power4/wordcopy.c>
-#endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
index b8ecda7..5d7b9fd 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
@@ -15,8 +15,4 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if IS_IN (libc)
#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c>
-#else
-#include <string/wordcopy.c>
-#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8548a53d699399e795a70e066401753622d797e3
commit 8548a53d699399e795a70e066401753622d797e3
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Wed Jan 21 07:38:28 2015 -0500
powerpc: multiarch Makefile cleanup for powerpc32
This patch cleanups the multiarch Makefile by putting the wide chars
implementation to correct wcsmbs rule.
diff --git a/ChangeLog b/ChangeLog
index 8944394..e849606 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
+ * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
+ [sysdep_routines]: Remove wide chars objects.
+ [wcsmbs]: New rule for wide char objects.
+
* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
Remove wordcopy-power6 obejct.
* sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c (__memmove_ppc):
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
index a7d33b9..2271d57 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
@@ -8,13 +8,19 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strnlen-ppc32 strncmp-power7 strncmp-ppc32 \
strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \
strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \
- strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \
- wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
- wcscpy-power7 wcscpy-power6 wcscpy-ppc32 wordcopy-power7 \
- wordcopy-power6 wordcopy-ppc32 memmove-power7 memmove-ppc
+ strchr-power7 strchr-ppc32 \
+ wordcopy-power7 wordcopy-power6 wordcopy-ppc32 \
+ memmove-power7 memmove-ppc
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
+endif
+
+ifeq ($(subdir),wcsmbs)
+sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc32 \
+ wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
+ wcscpy-power7 wcscpy-power6 wcscpy-ppc32
+
CFLAGS-wcschr-power7.c += -mcpu=power7
CFLAGS-wcschr-power6.c += -mcpu=power6
CFLAGS-wcsrchr-power7.c += -mcpu=power7
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b269211467795c71ae0ceb0ce79f2fb6614f33c9
commit b269211467795c71ae0ceb0ce79f2fb6614f33c9
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Wed Jan 21 07:41:46 2015 -0500
powerpc: wordcopy/memmove cleanup for ppc64
This patch cleanup some multiarch code related to memmmove
optimization. Initial IFUNC support added specialized wordcopy
symbols which turned in local IFUNC calls used by memmove default
implementation.
This change by removing then and used the optimized memmove instead
for supported chips.
diff --git a/ChangeLog b/ChangeLog
index f5c2941..8944394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
+ Remove wordcopy-power6 obejct.
+ * sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c (__memmove_ppc):
+ Use local call for wordcopy and memcpy symbols.
+ * sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c: Remove file.
+ * sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c: Add default
+ implementation for loader.
+ * sysdeps/powerpc/powerpc64/multiarch/wordcopy.c: Remove file.
+
+ * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
Remove wordcopy-power7 object.
* sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c: Remove file.
* sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
index 0111ad6..17265bd 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
@@ -11,19 +11,18 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \
strchr-power7 strchr-ppc64 \
strchrnul-power7 strchrnul-ppc64 \
- wordcopy-power6 wordcopy-ppc64 \
strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \
stpcpy-power7 stpcpy-ppc64 \
strrchr-power7 strrchr-ppc64 strncat-power7 strncat-ppc64 \
strncpy-power7 strncpy-ppc64 \
stpncpy-power8 stpncpy-power7 stpncpy-ppc64 \
strcmp-power8 strcmp-power7 strcmp-ppc64 \
- strcat-power8 strcat-power7 strcat-ppc64 memmove-power7 \
- memmove-ppc64 bcopy-ppc64 strncpy-power8
+ strcat-power8 strcat-power7 strcat-ppc64 \
+ memmove-power7 memmove-ppc64 wordcopy-ppc64 bcopy-ppc64 \
+ strncpy-power8
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
-CFLAGS-wordcopy-power6.c += -mcpu=power6
endif
ifeq ($(subdir),wcsmbs)
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
index 0ade49d..a2d8790 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
@@ -16,13 +16,27 @@
<http://www.gnu.org/licenses/>. */
#include <string.h>
+#include <memcopy.h>
+extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc;
+extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc;
+extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc;
+extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc;
+
+#define _wordcopy_fwd_aligned _wordcopy_fwd_aligned_ppc
+#define _wordcopy_fwd_dest_aligned _wordcopy_fwd_dest_aligned_ppc
+#define _wordcopy_bwd_aligned _wordcopy_bwd_aligned_ppc
+#define _wordcopy_bwd_dest_aligned _wordcopy_bwd_dest_aligned_ppc
+
+extern __typeof (memmove) __memmove_ppc attribute_hidden;
#define MEMMOVE __memmove_ppc
+
+extern __typeof (memcpy) __memcpy_ppc attribute_hidden;
+#define memcpy __memcpy_ppc
+
#if IS_IN (libc) && defined(SHARED)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name)
#endif
-extern __typeof (memmove) __memmove_ppc attribute_hidden;
-
#include <string/memmove.c>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c
deleted file mode 100644
index 4bd6494..0000000
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* wordcopy routines for powerpc64/power6.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; see the file COPYING.LIB. If
- not, see <http://www.gnu.org/licenses/>. */
-
-#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
index 5d7b9fd..b8ecda7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c
@@ -15,4 +15,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#if IS_IN (libc)
#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c>
+#else
+#include <string/wordcopy.c>
+#endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
deleted file mode 100644
index ec39732..0000000
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Multiple versions of wordcopy functions.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#if IS_IN (libc)
-# include <stddef.h>
-# include <memcopy.h>
-# include <shlib-compat.h>
-# include "init-arch.h"
-
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6
-attribute_hidden;
-
-libc_ifunc (_wordcopy_fwd_aligned,
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_fwd_aligned_power6
- : _wordcopy_fwd_aligned_ppc);
-
-
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6
-attribute_hidden;
-
-libc_ifunc (_wordcopy_fwd_dest_aligned,
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_fwd_dest_aligned_power6
- : _wordcopy_fwd_dest_aligned_ppc);
-
-
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6
-attribute_hidden;
-
-libc_ifunc (_wordcopy_bwd_aligned,
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_bwd_aligned_power6
- : _wordcopy_bwd_aligned_ppc);
-
-
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc
-attribute_hidden;
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6
-attribute_hidden;
-
-libc_ifunc (_wordcopy_bwd_dest_aligned,
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_bwd_dest_aligned_power6
- : _wordcopy_bwd_dest_aligned_ppc);
-
-#else
-#include <sysdeps/powerpc/power4/wordcopy.c>
-#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=18e270aada9d267679e7b0308a37684cfe3633b4
commit 18e270aada9d267679e7b0308a37684cfe3633b4
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Tue Jan 20 22:08:21 2015 -0500
powerpc: Remove POWER7 wordcopy ifunc
This patch remove the POWER7 ifunc wordcopy function
(_wordcopy_*_power7), since now GLIBC provides a optimized memmove/bcopy
for POWER7.
diff --git a/ChangeLog b/ChangeLog
index d5796a4..f5c2941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
+ * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
+ Remove wordcopy-power7 object.
+ * sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c: Remove file.
+ * sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
+ (_wordcopy_fwd_aligned): Remove POWER7 specialization.
+ (_wordcopy_fwd_dest_aligned): Likewise.
+ (_wordcopy_bwd_aligned): Likewise.
+ (_wordcopy_bwd_dest_aligned): Likewise.
+
* sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c (__bcopy_ppc):
Rewrite to call __memmove_ppc instead of include default
implementation.
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
index fe4f255..0111ad6 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
@@ -11,7 +11,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \
strchr-power7 strchr-ppc64 \
strchrnul-power7 strchrnul-ppc64 \
- wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \
+ wordcopy-power6 wordcopy-ppc64 \
strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \
stpcpy-power7 stpcpy-ppc64 \
strrchr-power7 strrchr-ppc64 strncat-power7 strncat-ppc64 \
@@ -23,7 +23,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
-CFLAGS-wordcopy-power7.c += -mcpu=power7
CFLAGS-wordcopy-power6.c += -mcpu=power6
endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c
deleted file mode 100644
index 3c54623..0000000
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* wordcopy routines for powerpc64/power7.
- Copyright (C) 2013-2015 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; see the file COPYING.LIB. If
- not, see <http://www.gnu.org/licenses/>. */
-
-#include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power7.c>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
index cc27540..ec39732 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
@@ -26,14 +26,10 @@ extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6
attribute_hidden;
-extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7
-attribute_hidden;
libc_ifunc (_wordcopy_fwd_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_fwd_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_fwd_aligned_power6
+ (hwcap & PPC_FEATURE_ARCH_2_05)
+ ? _wordcopy_fwd_aligned_power6
: _wordcopy_fwd_aligned_ppc);
@@ -41,14 +37,10 @@ extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6
attribute_hidden;
-extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7
-attribute_hidden;
libc_ifunc (_wordcopy_fwd_dest_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_fwd_dest_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_fwd_dest_aligned_power6
+ (hwcap & PPC_FEATURE_ARCH_2_05)
+ ? _wordcopy_fwd_dest_aligned_power6
: _wordcopy_fwd_dest_aligned_ppc);
@@ -56,14 +48,10 @@ extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6
attribute_hidden;
-extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7
-attribute_hidden;
libc_ifunc (_wordcopy_bwd_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_bwd_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_bwd_aligned_power6
+ (hwcap & PPC_FEATURE_ARCH_2_05)
+ ? _wordcopy_bwd_aligned_power6
: _wordcopy_bwd_aligned_ppc);
@@ -71,14 +59,10 @@ extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc
attribute_hidden;
extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6
attribute_hidden;
-extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7
-attribute_hidden;
libc_ifunc (_wordcopy_bwd_dest_aligned,
- (hwcap & PPC_FEATURE_HAS_VSX)
- ? _wordcopy_bwd_dest_aligned_power7 :
- (hwcap & PPC_FEATURE_ARCH_2_05)
- ? _wordcopy_bwd_dest_aligned_power6
+ (hwcap & PPC_FEATURE_ARCH_2_05)
+ ? _wordcopy_bwd_dest_aligned_power6
: _wordcopy_bwd_dest_aligned_ppc);
#else
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6f0993a6387158aac2b1b7ff6f8e4ffd75877d2a
commit 6f0993a6387158aac2b1b7ff6f8e4ffd75877d2a
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Tue Jan 20 22:02:03 2015 -0500
powerpc: Simplify bcopy default implementation
This patch simplify the default bcopy symbol for powerpc64 by just using
memmove instead of implementing using the default bcopy. Since the
symbol is deprecated, it trades speed by code size.
diff --git a/ChangeLog b/ChangeLog
index 1692ada..d5796a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
+ * sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c (__bcopy_ppc):
+ Rewrite to call __memmove_ppc instead of include default
+ implementation.
+
* sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
Remove wide chars objects.
[wcsmbs]: New rule for wide char objects.
diff --git a/sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c
index 14ecb9f..eb182b2 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c
@@ -18,8 +18,10 @@
#include <string.h>
-extern __typeof (bcopy) __bcopy_ppc attribute_hidden;
+extern __typeof (bcopy) __bcopy_ppc attribute_hidden;
+extern __typeof (memmove) __memmove_ppc attribute_hidden;
-#define bcopy __bcopy_ppc
-
-#include <string/bcopy.c>
+void __bcopy_ppc (const void *src, void *dest, size_t n)
+{
+ __memmove_ppc (dest, src, n);
+}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3001e54c5786f714537acfb631b502e2229f883f
commit 3001e54c5786f714537acfb631b502e2229f883f
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Tue Jan 20 15:41:38 2015 -0500
powerpc: multiarch Makefile cleanup for powerpc64
This patch cleanups the multiarch Makefile by putting the wide chars
implementation to correct wcsmbs rule.
diff --git a/ChangeLog b/ChangeLog
index 8f90a96..1692ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com>
+
+ * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
+ Remove wide chars objects.
+ [wcsmbs]: New rule for wide char objects.
+
2015-02-09 Andreas Schwab <schwab@suse.de>
[BZ #17912]
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
index b7ea284..fe4f255 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
@@ -10,9 +10,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strncase-power7 strncase_l-power7 \
strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \
strchr-power7 strchr-ppc64 \
- strchrnul-power7 strchrnul-ppc64 wcschr-power7 \
- wcschr-power6 wcschr-ppc64 wcsrchr-power7 wcsrchr-power6 \
- wcsrchr-ppc64 wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \
+ strchrnul-power7 strchrnul-ppc64 \
wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \
strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \
stpcpy-power7 stpcpy-ppc64 \
@@ -25,12 +23,19 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
+CFLAGS-wordcopy-power7.c += -mcpu=power7
+CFLAGS-wordcopy-power6.c += -mcpu=power6
+endif
+
+ifeq ($(subdir),wcsmbs)
+sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc64 \
+ wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc64 \
+ wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \
+
CFLAGS-wcschr-power7.c += -mcpu=power7
CFLAGS-wcschr-power6.c += -mcpu=power6
CFLAGS-wcsrchr-power7.c += -mcpu=power7
CFLAGS-wcsrchr-power6.c += -mcpu=power6
CFLAGS-wcscpy-power7.c += -mcpu=power7
CFLAGS-wcscpy-power6.c += -mcpu=power6
-CFLAGS-wordcopy-power7.c += -mcpu=power7
-CFLAGS-wordcopy-power6.c += -mcpu=power6
endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 44 ++++++++++
.../powerpc/powerpc32/power4/multiarch/Makefile | 14 +++-
.../powerpc32/power4/multiarch/memmove-power7.c | 11 +++
.../powerpc32/power4/multiarch/memmove-ppc.c | 11 +++
.../powerpc32/power4/multiarch/wordcopy-power6.c | 23 -----
.../powerpc32/power4/multiarch/wordcopy-ppc32.c | 14 ++-
.../powerpc/powerpc32/power4/multiarch/wordcopy.c | 86 --------------------
sysdeps/powerpc/powerpc64/multiarch/Makefile | 19 +++--
sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c | 10 ++-
.../powerpc/powerpc64/multiarch/memmove-ppc64.c | 18 ++++-
.../powerpc/powerpc64/multiarch/wordcopy-power6.c | 19 -----
.../powerpc/powerpc64/multiarch/wordcopy-power7.c | 19 -----
sysdeps/powerpc/powerpc64/multiarch/wordcopy.c | 86 --------------------
13 files changed, 118 insertions(+), 256 deletions(-)
delete mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c
delete mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c
delete mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy-power6.c
delete mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c
delete mode 100644 sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
hooks/post-receive
--
GNU C Library master sources