|
 |
147e83 |
From 942cdf02caef0ea4fe257cf5898754b9b1897c4a Mon Sep 17 00:00:00 2001
|
|
|
147e83 |
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Wed, 30 Jul 2014 05:58:14 -0500
|
|
|
147e83 |
Subject: [PATCH] PowerPC: multiarch strchrnul for PowerPC64
|
|
|
147e83 |
|
|
|
147e83 |
commit 9ee2969b057862443b81789b56a61514edf34779
|
|
|
147e83 |
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Fri Dec 13 14:50:26 2013 -0500
|
|
|
147e83 |
|
|
|
147e83 |
Added sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c and
|
|
|
147e83 |
string/strchrnul.c apart from original commit.
|
|
|
147e83 |
---
|
|
|
147e83 |
string/strchrnul.c | 6 +++-
|
|
|
147e83 |
.../powerpc32/power4/multiarch/strchrnul-ppc32.c | 28 ++++++++++++++++
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/multiarch/Makefile | 3 +-
|
|
|
147e83 |
.../powerpc/powerpc64/multiarch/ifunc-impl-list.c | 8 +++++
|
|
|
147e83 |
.../powerpc/powerpc64/multiarch/strchrnul-power7.S | 38 ++++++++++++++++++++++
|
|
|
147e83 |
.../powerpc/powerpc64/multiarch/strchrnul-ppc64.c | 19 +++++++++++
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/multiarch/strchrnul.c | 37 +++++++++++++++++++++
|
|
|
147e83 |
7 files changed, 137 insertions(+), 2 deletions(-)
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
|
|
|
147e83 |
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/string/strchrnul.c glibc-2.17-c758a686/string/strchrnul.c
|
|
|
147e83 |
index 0db5e23..39540a3 100644
|
|
|
147e83 |
--- glibc-2.17-c758a686/string/strchrnul.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/string/strchrnul.c
|
|
|
147e83 |
@@ -27,9 +27,13 @@
|
|
|
147e83 |
#undef __strchrnul
|
|
|
147e83 |
#undef strchrnul
|
|
|
147e83 |
|
|
|
147e83 |
+#ifndef STRCHRNUL
|
|
|
147e83 |
+# define STRCHRNUL __strchrnul
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+
|
|
|
147e83 |
/* Find the first occurrence of C in S or the final NUL byte. */
|
|
|
147e83 |
char *
|
|
|
147e83 |
-__strchrnul (s, c_in)
|
|
|
147e83 |
+STRCHRNUL (s, c_in)
|
|
|
147e83 |
const char *s;
|
|
|
147e83 |
int c_in;
|
|
|
147e83 |
{
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..950643a
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c
|
|
|
147e83 |
@@ -0,0 +1,28 @@
|
|
|
147e83 |
+/* PowerPC32 default implementation of strchrnul.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <string.h>
|
|
|
147e83 |
+
|
|
|
147e83 |
+#define STRCHRNUL __strchrnul_ppc
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef weak_alias
|
|
|
147e83 |
+#define weak_alias(a,b )
|
|
|
147e83 |
+
|
|
|
147e83 |
+extern __typeof (strchrnul) __strchrnul_ppc attribute_hidden;
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <string/strchrnul.c>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
147e83 |
index f7c5853..15b86bd 100644
|
|
|
147e83 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
147e83 |
@@ -8,7 +8,8 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
|
|
|
147e83 |
rawmemchr-ppc64 strlen-power7 strlen-ppc64 strnlen-power7 \
|
|
|
147e83 |
strnlen-ppc64 strcasecmp-power7 strcasecmp_l-power7 \
|
|
|
147e83 |
strncase-power7 strncase_l-power7 strncmp-power7 \
|
|
|
147e83 |
- strncmp-power4 strncmp-ppc64 strchr-power7 strchr-ppc64
|
|
|
147e83 |
+ strncmp-power4 strncmp-ppc64 strchr-power7 strchr-ppc64 \
|
|
|
147e83 |
+ strchrnul-power7 strchrnul-ppc64
|
|
|
147e83 |
|
|
|
147e83 |
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
|
|
|
147e83 |
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
147e83 |
index 3b005ea..9e3b89d 100644
|
|
|
147e83 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
|
|
|
147e83 |
@@ -94,6 +94,14 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
147e83 |
__strchr_power7)
|
|
|
147e83 |
IFUNC_IMPL_ADD (array, i, strchr, 1,
|
|
|
147e83 |
__strchr_ppc))
|
|
|
147e83 |
+
|
|
|
147e83 |
+ /* Support sysdeps/powerpc/powerpc64/multiarch/strchrnul.c. */
|
|
|
147e83 |
+ IFUNC_IMPL (i, name, strchrnul,
|
|
|
147e83 |
+ IFUNC_IMPL_ADD (array, i, strchrnul,
|
|
|
147e83 |
+ hwcap & PPC_FEATURE_HAS_VSX,
|
|
|
147e83 |
+ __strchrnul_power7)
|
|
|
147e83 |
+ IFUNC_IMPL_ADD (array, i, strchrnul, 1,
|
|
|
147e83 |
+ __strchrnul_ppc))
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
/* Support sysdeps/powerpc/powerpc64/multiarch/memcmp.c. */
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..87d7c03
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S
|
|
|
147e83 |
@@ -0,0 +1,38 @@
|
|
|
147e83 |
+/* Optimized strchrnul implementation for POWER7.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdep.h>
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef ENTRY
|
|
|
147e83 |
+#define ENTRY(name) \
|
|
|
147e83 |
+ .section ".text"; \
|
|
|
147e83 |
+ ENTRY_2(__strchrnul_power7) \
|
|
|
147e83 |
+ .align ALIGNARG(2); \
|
|
|
147e83 |
+ BODY_LABEL(__strchrnul_power7): \
|
|
|
147e83 |
+ cfi_startproc;
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef END
|
|
|
147e83 |
+#define END(name) \
|
|
|
147e83 |
+ cfi_endproc; \
|
|
|
147e83 |
+ TRACEBACK(__strchrnul_power7) \
|
|
|
147e83 |
+ END_2(__strchrnul_power7)
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef libc_hidden_builtin_def
|
|
|
147e83 |
+#define libc_hidden_builtin_def(name)
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdeps/powerpc/powerpc64/power7/strchrnul.S>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..a76b335
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c
|
|
|
147e83 |
@@ -0,0 +1,19 @@
|
|
|
147e83 |
+/* PowerPC64 default implementation of strchrnul.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul-ppc32.c>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..dab1cbf
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
|
|
|
147e83 |
@@ -0,0 +1,37 @@
|
|
|
147e83 |
+/* Multiple versions of strchrnul.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#ifndef NOT_IN_libc
|
|
|
147e83 |
+# include <string.h>
|
|
|
147e83 |
+# include <shlib-compat.h>
|
|
|
147e83 |
+# include "init-arch.h"
|
|
|
147e83 |
+
|
|
|
147e83 |
+extern __typeof (__strchrnul) __strchrnul_ppc attribute_hidden;
|
|
|
147e83 |
+extern __typeof (__strchrnul) __strchrnul_power7 attribute_hidden;
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
|
|
|
147e83 |
+ ifunc symbol properly. */
|
|
|
147e83 |
+libc_ifunc (__strchrnul,
|
|
|
147e83 |
+ (hwcap & PPC_FEATURE_HAS_VSX)
|
|
|
147e83 |
+ ? __strchrnul_power7
|
|
|
147e83 |
+ : __strchrnul_ppc);
|
|
|
147e83 |
+
|
|
|
147e83 |
+weak_alias (__strchrnul, strchrnul)
|
|
|
147e83 |
+#else
|
|
|
147e83 |
+#include <string/strchrnul.c>
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
--
|
|
|
147e83 |
1.8.3.1
|
|
|
147e83 |
|