You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
200 lines
8.6 KiB
200 lines
8.6 KiB
From dc5a73198455f4492a44dbc71fdadeb7551d5810 Mon Sep 17 00:00:00 2001 |
|
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com> |
|
Date: Wed, 30 Jul 2014 05:41:40 -0500 |
|
Subject: [PATCH] PowerPC: multiarch strnlen for PowerPC64 |
|
|
|
commit 62982bf9782f0f3ef4259fc03b1b557f1332b182 |
|
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com> |
|
Date: Fri Dec 13 14:38:50 2013 -0500 |
|
|
|
Added sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c |
|
apart from original commit. |
|
--- |
|
.../powerpc32/power4/multiarch/strnlen-ppc32.c | 26 ++++++++++++++ |
|
sysdeps/powerpc/powerpc64/multiarch/Makefile | 3 +- |
|
.../powerpc/powerpc64/multiarch/ifunc-impl-list.c | 7 ++++ |
|
.../powerpc/powerpc64/multiarch/strnlen-power7.S | 40 ++++++++++++++++++++++ |
|
.../powerpc/powerpc64/multiarch/strnlen-ppc64.c | 18 ++++++++++ |
|
sysdeps/powerpc/powerpc64/multiarch/strnlen.c | 36 +++++++++++++++++++ |
|
6 files changed, 129 insertions(+), 1 deletion(-) |
|
create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c |
|
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S |
|
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c |
|
create mode 100644 sysdeps/powerpc/powerpc64/multiarch/strnlen.c |
|
|
|
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c |
|
new file mode 100644 |
|
index 0000000..676d837 |
|
--- /dev/null |
|
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c |
|
@@ -0,0 +1,26 @@ |
|
+/* Default strnlen implementation for PowerPC32. |
|
+ Copyright (C) 2013-2014 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 STRNLEN __strnlen_ppc |
|
+#ifdef SHARED |
|
+# undef libc_hidden_def |
|
+# define libc_hidden_def(name) \ |
|
+ __hidden_ver1 (__strnlen_ppc, __GI_strnlen, __strnlen_ppc); |
|
+#endif |
|
+ |
|
+#include <string/strnlen.c> |
|
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile |
|
index 9da7be1..3285fd7 100644 |
|
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile |
|
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile |
|
@@ -5,5 +5,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ |
|
memset-ppc64 bzero-power4 bzero-power6 bzero-power7 \ |
|
mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64 \ |
|
memrchr-power7 memrchr-ppc64 rawmemchr-power7 \ |
|
- rawmemchr-ppc64 strlen-power7 strlen-ppc64 |
|
+ rawmemchr-ppc64 strlen-power7 strlen-ppc64 strnlen-power7 \ |
|
+ strnlen-ppc64 |
|
endif |
|
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 |
|
index bdc908b..c9125b8 100644 |
|
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c |
|
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c |
|
@@ -129,5 +129,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, |
|
IFUNC_IMPL_ADD (array, i, rawmemchr, 1, |
|
__rawmemchr_ppc)) |
|
|
|
+ /* Support sysdeps/powerpc/powerpc64/multiarch/strnlen.c. */ |
|
+ IFUNC_IMPL (i, name, strnlen, |
|
+ IFUNC_IMPL_ADD (array, i, strnlen, hwcap & PPC_FEATURE_HAS_VSX, |
|
+ __strnlen_power7) |
|
+ IFUNC_IMPL_ADD (array, i, strnlen, 1, |
|
+ __strnlen_ppc)) |
|
+ |
|
return i; |
|
} |
|
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S |
|
new file mode 100644 |
|
index 0000000..909aae8 |
|
--- /dev/null |
|
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S |
|
@@ -0,0 +1,40 @@ |
|
+/* Optimized strnlen version for POWER7. |
|
+ Copyright (C) 2013-2014 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/>. */ |
|
+ |
|
+#include <sysdep.h> |
|
+ |
|
+#undef ENTRY |
|
+#define ENTRY(name) \ |
|
+ .section ".text"; \ |
|
+ ENTRY_2(__strnlen_power7) \ |
|
+ .align ALIGNARG(2); \ |
|
+ BODY_LABEL(__strnlen_power7): \ |
|
+ cfi_startproc; |
|
+ |
|
+#undef END |
|
+#define END(name) \ |
|
+ cfi_endproc; \ |
|
+ TRACEBACK(__strnlen_power7) \ |
|
+ END_2(__strnlen_power7) |
|
+ |
|
+#undef libc_hidden_builtin_def |
|
+#define libc_hidden_builtin_def(name) |
|
+#undef weak_alias |
|
+#define weak_alias(name, alias) |
|
+ |
|
+#include <sysdeps/powerpc/powerpc64/power7/strnlen.S> |
|
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c |
|
new file mode 100644 |
|
index 0000000..9d23994 |
|
--- /dev/null |
|
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c |
|
@@ -0,0 +1,18 @@ |
|
+/* Copyright (C) 2013-2014 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/>. */ |
|
+ |
|
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/strnlen-ppc32.c> |
|
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen.c |
|
new file mode 100644 |
|
index 0000000..3926031 |
|
--- /dev/null |
|
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/strnlen.c |
|
@@ -0,0 +1,36 @@ |
|
+/* Multiple versions of strnlen. |
|
+ Copyright (C) 2013-2014 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/>. */ |
|
+ |
|
+#ifndef NOT_IN_libc |
|
+# include <string.h> |
|
+# include <shlib-compat.h> |
|
+# include "init-arch.h" |
|
+ |
|
+extern __typeof (__strnlen) __strnlen_ppc attribute_hidden; |
|
+extern __typeof (__strnlen) __strnlen_power7 attribute_hidden; |
|
+ |
|
+libc_ifunc (__strnlen, |
|
+ (hwcap & PPC_FEATURE_HAS_VSX) |
|
+ ? __strnlen_power7 |
|
+ : __strnlen_ppc); |
|
+weak_alias (__strnlen, strnlen) |
|
+libc_hidden_def (strnlen) |
|
+ |
|
+#else |
|
+#include <string/strnlen.c> |
|
+#endif |
|
-- |
|
1.8.3.1 |
|
|
|
|