diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2015-07-28 15:34:25 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-08-11 10:03:09 -0300 |
| commit | 357bb400f1b25e48e265fd55b5996328d2a8c142 (patch) | |
| tree | f9b0161bcbf8999f11b90789f19ab7eade730884 | |
| parent | f25238ffe0455013174438376b3ee88df496f9d1 (diff) | |
| download | glibc-357bb400f1b25e48e265fd55b5996328d2a8c142.tar.gz glibc-357bb400f1b25e48e265fd55b5996328d2a8c142.tar.xz glibc-357bb400f1b25e48e265fd55b5996328d2a8c142.zip | |
powerpc: Fix strstr/power7 build
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. * sysdeps/powerpc/powerpc64/power7/Makefile [$(subdir) = string] (sysdep_routines): Add strstr-ppc64. * sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c: New file.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c | 27 |
3 files changed, 34 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 142175fdef..efd999bbd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-10 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-08-10 Maxim Ostapenko <m.ostapenko@partner.samsung.com> [BZ #18778] diff --git a/sysdeps/powerpc/powerpc64/power7/Makefile b/sysdeps/powerpc/powerpc64/power7/Makefile index 40aacfa15a..89a2296085 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 0000000000..bbab92d1ef --- /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> |