|
 |
147e83 |
From c59b219a7fb36564572a864bd61a5cdc7e37f25b Mon Sep 17 00:00:00 2001
|
|
|
147e83 |
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Wed, 30 Jul 2014 05:35:32 -0500
|
|
|
147e83 |
Subject: [PATCH] PowerPC: multiarch rawmemchr for PowerPC64
|
|
|
147e83 |
|
|
|
147e83 |
commit 1fd005ad2f8ca30d44d5bfa036422b4ec281ea4a
|
|
|
147e83 |
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Fri Dec 13 14:37:26 2013 -0500
|
|
|
147e83 |
|
|
|
147e83 |
Added sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr-ppc32.c and
|
|
|
147e83 |
string/rawmemchr.c apart from original commit.
|
|
|
147e83 |
---
|
|
|
147e83 |
string/rawmemchr.c | 5 ++-
|
|
|
147e83 |
.../powerpc32/power4/multiarch/rawmemchr-ppc32.c | 32 +++++++++++++++++++
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/multiarch/Makefile | 3 +-
|
|
|
147e83 |
.../powerpc/powerpc64/multiarch/ifunc-impl-list.c | 8 +++++
|
|
|
147e83 |
.../powerpc/powerpc64/multiarch/rawmemchr-power7.S | 35 ++++++++++++++++++++
|
|
|
147e83 |
.../powerpc/powerpc64/multiarch/rawmemchr-ppc64.c | 19 +++++++++++
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c | 37 ++++++++++++++++++++++
|
|
|
147e83 |
7 files changed, 137 insertions(+), 2 deletions(-)
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr-ppc32.c
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
|
|
|
147e83 |
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/string/rawmemchr.c glibc-2.17-c758a686/string/rawmemchr.c
|
|
|
147e83 |
index 90e8c7c..0e4f192 100644
|
|
|
147e83 |
--- glibc-2.17-c758a686/string/rawmemchr.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/string/rawmemchr.c
|
|
|
147e83 |
@@ -47,10 +47,13 @@
|
|
|
147e83 |
|
|
|
147e83 |
#undef memchr
|
|
|
147e83 |
|
|
|
147e83 |
+#ifndef RAWMEMCHR
|
|
|
147e83 |
+# define RAWMEMCHR __rawmemchr
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
|
|
|
147e83 |
/* Find the first occurrence of C in S. */
|
|
|
147e83 |
__ptr_t
|
|
|
147e83 |
-__rawmemchr (s, c_in)
|
|
|
147e83 |
+RAWMEMCHR (s, c_in)
|
|
|
147e83 |
const __ptr_t s;
|
|
|
147e83 |
int c_in;
|
|
|
147e83 |
{
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr-ppc32.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..2e8abaa
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr-ppc32.c
|
|
|
147e83 |
@@ -0,0 +1,32 @@
|
|
|
147e83 |
+/* PowerPC32 default implementation of rawmemchr.
|
|
|
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 RAWMEMCHR __rawmemchr_ppc
|
|
|
147e83 |
+#undef weak_alias
|
|
|
147e83 |
+#define weak_alias(a, b)
|
|
|
147e83 |
+#ifdef SHARED
|
|
|
147e83 |
+# undef libc_hidden_def
|
|
|
147e83 |
+# define libc_hidden_def(name) \
|
|
|
147e83 |
+ __hidden_ver1 (__rawmemchr_ppc, __GI___rawmemchr, __rawmemchr_ppc);
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+
|
|
|
147e83 |
+extern __typeof (rawmemchr) __rawmemchr_ppc attribute_hidden;
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <string/rawmemchr.c>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
147e83 |
index db765f2..695112c 100644
|
|
|
147e83 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
|
|
|
147e83 |
@@ -4,5 +4,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
|
|
|
147e83 |
memcmp-ppc64 memset-power7 memset-power6 memset-power4 \
|
|
|
147e83 |
memset-ppc64 bzero-power4 bzero-power6 bzero-power7 \
|
|
|
147e83 |
mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64 \
|
|
|
147e83 |
- memrchr-power7 memrchr-ppc64
|
|
|
147e83 |
+ memrchr-power7 memrchr-ppc64 rawmemchr-power7 \
|
|
|
147e83 |
+ rawmemchr-ppc64
|
|
|
147e83 |
endif
|
|
|
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 a0700dc..5b15c3f 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 |
@@ -114,5 +114,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
147e83 |
IFUNC_IMPL_ADD (array, i, memrchr, 1,
|
|
|
147e83 |
__memrchr_ppc))
|
|
|
147e83 |
|
|
|
147e83 |
+ /* Support sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c. */
|
|
|
147e83 |
+ IFUNC_IMPL (i, name, rawmemchr,
|
|
|
147e83 |
+ IFUNC_IMPL_ADD (array, i, rawmemchr,
|
|
|
147e83 |
+ hwcap & PPC_FEATURE_HAS_VSX,
|
|
|
147e83 |
+ __rawmemchr_power7)
|
|
|
147e83 |
+ IFUNC_IMPL_ADD (array, i, rawmemchr, 1,
|
|
|
147e83 |
+ __rawmemchr_ppc))
|
|
|
147e83 |
+
|
|
|
147e83 |
return i;
|
|
|
147e83 |
}
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..24ae3bf
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S
|
|
|
147e83 |
@@ -0,0 +1,35 @@
|
|
|
147e83 |
+/* Optimized rawmemchr implementation for PowerPC64/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(__rawmemchr_power7) \
|
|
|
147e83 |
+ .align ALIGNARG(2); \
|
|
|
147e83 |
+ BODY_LABEL(__rawmemchr_power7): \
|
|
|
147e83 |
+ cfi_startproc;
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef END
|
|
|
147e83 |
+#define END(name) \
|
|
|
147e83 |
+ cfi_endproc; \
|
|
|
147e83 |
+ TRACEBACK(__rawmemchr_power7) \
|
|
|
147e83 |
+ END_2(__rawmemchr_power7)
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdeps/powerpc/powerpc64/power7/rawmemchr.S>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..0f2f202
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c
|
|
|
147e83 |
@@ -0,0 +1,19 @@
|
|
|
147e83 |
+/* PowerPC64 default implementation of rawmemchr.
|
|
|
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/rawmemchr-ppc32.c>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..3f53cd5
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
|
|
|
147e83 |
@@ -0,0 +1,37 @@
|
|
|
147e83 |
+/* Multiple versions of rawmemchr.
|
|
|
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 (__rawmemchr) __rawmemchr_ppc attribute_hidden;
|
|
|
147e83 |
+extern __typeof (__rawmemchr) __rawmemchr_power7 attribute_hidden;
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
|
|
|
147e83 |
+ ifunc symbol properly. */
|
|
|
147e83 |
+libc_ifunc (__rawmemchr,
|
|
|
147e83 |
+ (hwcap & PPC_FEATURE_HAS_VSX)
|
|
|
147e83 |
+ ? __rawmemchr_power7
|
|
|
147e83 |
+ : __rawmemchr_ppc);
|
|
|
147e83 |
+
|
|
|
147e83 |
+weak_alias (__rawmemchr, rawmemchr)
|
|
|
147e83 |
+#else
|
|
|
147e83 |
+#include <string/rawmemchr.c>
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
--
|
|
|
147e83 |
1.8.3.1
|
|
|
147e83 |
|