diff options
| author | Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> | 2017-04-11 14:18:35 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2017-04-11 17:13:54 -0300 |
| commit | 001649fd18712a8d508a21781e8059ef1e9bcecf (patch) | |
| tree | b203b01d992635bd616db71266498043f00d9199 /sysdeps/powerpc/powerpc64/power7 | |
| parent | 3bc426e156c6952a1b7e32435c308aaab76616a1 (diff) | |
| download | glibc-001649fd18712a8d508a21781e8059ef1e9bcecf.tar.gz glibc-001649fd18712a8d508a21781e8059ef1e9bcecf.tar.xz glibc-001649fd18712a8d508a21781e8059ef1e9bcecf.zip | |
powerpc: refactor strnlen and strlen IFUNC.
Clean up the IFUNC implementations for powerpc in order to remove unneeded macro definitions. Tested on ppc64le with and without --disable-multi-arch flag. * sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S: Define the strlen implementation name and remove unneeded macros definition. * sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Define the strnlen implementation name and remove unneeded macros definition. * sysdeps/powerpc/powerpc64/power7/strlen.S: Set a default function name if not defined and pass as parameter to macros accordingly. * sysdeps/powerpc/powerpc64/power7/strnlen.S: Likewise. * sysdeps/powerpc/powerpc64/power8/strlen.S: Likewise. * sysdeps/powerpc/powerpc64/strlen.S: Likewise.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/power7')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/strlen.S | 8 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power7/strnlen.S | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sysdeps/powerpc/powerpc64/power7/strlen.S b/sysdeps/powerpc/powerpc64/power7/strlen.S index 62db6d4223..63848c460c 100644 --- a/sysdeps/powerpc/powerpc64/power7/strlen.S +++ b/sysdeps/powerpc/powerpc64/power7/strlen.S @@ -20,8 +20,12 @@ #include <sysdep.h> /* int [r3] strlen (char *s [r3]) */ + +#ifndef STRLEN +# define STRLEN strlen +#endif .machine power7 -ENTRY (strlen) +ENTRY (STRLEN) CALL_MCOUNT 1 dcbt 0,r3 clrrdi r4,r3,3 /* Align the address to doubleword boundary. */ @@ -99,5 +103,5 @@ L(done): srdi r0,r0,3 /* Convert leading/trailing zeros to bytes. */ add r3,r5,r0 /* Compute final length. */ blr -END (strlen) +END (STRLEN) libc_hidden_builtin_def (strlen) diff --git a/sysdeps/powerpc/powerpc64/power7/strnlen.S b/sysdeps/powerpc/powerpc64/power7/strnlen.S index d066ea7094..a970b6ce30 100644 --- a/sysdeps/powerpc/powerpc64/power7/strnlen.S +++ b/sysdeps/powerpc/powerpc64/power7/strnlen.S @@ -19,9 +19,13 @@ #include <sysdep.h> +#ifndef STRNLEN +# define STRNLEN __strnlen +#endif + /* int [r3] strnlen (char *s [r3], int size [r4]) */ .machine power7 -ENTRY (__strnlen) +ENTRY (STRNLEN) CALL_MCOUNT 2 dcbt 0,r3 clrrdi r8,r3,3 @@ -172,7 +176,7 @@ L(loop_small): mr r3,r4 blr -END (__strnlen) +END (STRNLEN) libc_hidden_def (__strnlen) weak_alias (__strnlen, strnlen) libc_hidden_def (strnlen) |