diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-04-08 17:25:14 -0500 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-04-09 06:22:53 -0500 |
| commit | de21c33c068c8e39afb5711613a7c083c11ce6a1 (patch) | |
| tree | aabf4e6e97e698148f0147fb671152c622b9f27d /sysdeps/powerpc/powerpc64/power7 | |
| parent | 862c472efa28aedf22908f2735111ab4b9e62811 (diff) | |
| download | glibc-de21c33c068c8e39afb5711613a7c083c11ce6a1.tar glibc-de21c33c068c8e39afb5711613a7c083c11ce6a1.tar.gz glibc-de21c33c068c8e39afb5711613a7c083c11ce6a1.tar.bz2 glibc-de21c33c068c8e39afb5711613a7c083c11ce6a1.zip | |
PowerPC: Fix --disable-multi-arch builds
This patch fixes some powerpc32 and powerpc64 builds with
--disable-multi-arch option along with different --with-cpu=powerN.
It cleanups the Implies directories by removing the multiarch
folder for non multiarch config and also fixing two assembly
implementations: powerpc64/power7/strncat.S that is calling the
wrong strlen; and power8/fpu/s_isnan.S that misses the hidden_def and
weak_alias directives.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/power7')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/fpu/Implies | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/strncat.S | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/Implies index 410d289a6d..30fa17646e 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power7/fpu/Implies @@ -1 +1 @@ -powerpc/powerpc64/power6/fpu/multiarch +powerpc/powerpc64/power6/fpu diff --git a/sysdeps/powerpc/powerpc64/power7/strncat.S b/sysdeps/powerpc/powerpc64/power7/strncat.S index 1a1a95e030..e7e36a4de4 100644 --- a/sysdeps/powerpc/powerpc64/power7/strncat.S +++ b/sysdeps/powerpc/powerpc64/power7/strncat.S @@ -38,7 +38,9 @@ #endif #ifndef STRLEN -# define STRLEN __strlen_ppc +/* For builds with no IFUNC support, local calls should be made to internal + GLIBC symbol (created by libc_hidden_builtin_def). */ +# define STRLEN __GI_strlen #endif #define FRAMESIZE (FRAME_MIN_SIZE+32) |