diff mbox

[1/3] powerpc: Fix strstr/power7 build

Message ID 55B8237F.8060309@linaro.org
State Committed
Delegated to: Tulio Magno Quites Machado Filho
Headers

Commit Message

Adhemerval Zanella July 29, 2015, 12:51 a.m. UTC 
  This patch fixes the strstr build with --disable-multi-arch option.
The optimization calls the __strstr_ppc symbol, which always build
for multiarch config but not if it is disable.  This patch fixes it
by adding the default C implementation object with the expected
symbol name.

Checked on powerpc64le.

--

	* sysdeps/powerpc/powerpc64/power7/Makefile [$(subdir) = string]
	(sysdep_routines): Add strstr-ppc64.
	* sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c: New file.

--

Comments

Tulio Magno Quites Machado Filho Aug. 5, 2015, 6:41 p.m. UTC | #1 
Adhemerval Zanella <adhemerval.zanella@linaro.org> writes:

> This patch fixes the strstr build with --disable-multi-arch option.
> The optimization calls the __strstr_ppc symbol, which always build
> for multiarch config but not if it is disable.  This patch fixes it
> by adding the default C implementation object with the expected
> symbol name.
>
> Checked on powerpc64le.

LGTM.

Thanks!
Adhemerval Zanella Aug. 11, 2015, 1:12 p.m. UTC | #2 
Pushed upstream as 357bb400f1b25e48e265fd55b5996328d2a8c142

On 05-08-2015 15:41, Tulio Magno Quites Machado Filho wrote:
> Adhemerval Zanella <adhemerval.zanella@linaro.org> writes:
> 
>> This patch fixes the strstr build with --disable-multi-arch option.
>> The optimization calls the __strstr_ppc symbol, which always build
>> for multiarch config but not if it is disable.  This patch fixes it
>> by adding the default C implementation object with the expected
>> symbol name.
>>
>> Checked on powerpc64le.
> 
> LGTM.
> 
> Thanks!
>
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index c753d5c..0ad9742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@ 
+2015-07-28  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/powerpc/powerpc64/power7/Makefile [$(subdir) = string]
+	(sysdep_routines): Add strstr-ppc64.
+	* sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c: New file.
+
 2015-07-27  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/unix/sysv/linux/ia64/localplt.data: Delete __tls_get_addr.
diff --git a/sysdeps/powerpc/powerpc64/power7/Makefile b/sysdeps/powerpc/powerpc64/power7/Makefile
index 40aacfa..89a2296 100644
--- a/sysdeps/powerpc/powerpc64/power7/Makefile
+++ b/sysdeps/powerpc/powerpc64/power7/Makefile
@@ -5,6 +5,7 @@  CFLAGS-rtld.c += -mno-vsx
 endif
 
 ifeq ($(subdir),string)
+sysdep_routines += strstr-ppc64
 CFLAGS-strncase.c += -funroll-loops
 CFLAGS-strncase_l.c += -funroll-loops
 endif
diff --git a/sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c b/sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c
new file mode 100644
index 0000000..bbab92d
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c
@@ -0,0 +1,27 @@ 
+/* Optimized strstr implementation for PowerPC64/POWER7.
+   Copyright (C) 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/>.  */
+
+#include <string.h>
+
+#define STRSTR __strstr_ppc
+#undef libc_hidden_builtin_def
+#define libc_hidden_builtin_def(__name)
+
+extern __typeof (strstr) __strstr_ppc attribute_hidden;
+
+#include <string/strstr.c>