diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-05-30 18:00:57 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-06-06 16:03:29 -0300 |
| commit | c24480ce3b5fed848243fc9642932ef2fa670109 (patch) | |
| tree | baa3e66991dd688df62c3b296016bb15d0ef1650 /sysdeps/powerpc/powerpc64/power8 | |
| parent | b5537473c2ccb6874985e3d2bc0a0c7e204213bd (diff) | |
| download | glibc-c24480ce3b5fed848243fc9642932ef2fa670109.tar.gz glibc-c24480ce3b5fed848243fc9642932ef2fa670109.tar.xz glibc-c24480ce3b5fed848243fc9642932ef2fa670109.zip | |
powerpc: Fix --disable-multi-arch build on POWER8
Add missing symbols of stpncpy and strcasestr when multi-arch is disabled. Fix memset call from strncpy/stpncpy when multi-arch is disabled.
Diffstat (limited to 'sysdeps/powerpc/powerpc64/power8')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power8/stpncpy.S | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power8/strcasestr.S | 7 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power8/strncpy.S | 16 |
3 files changed, 21 insertions, 6 deletions
diff --git a/sysdeps/powerpc/powerpc64/power8/stpncpy.S b/sysdeps/powerpc/powerpc64/power8/stpncpy.S index 067910b373..9393dd44a0 100644 --- a/sysdeps/powerpc/powerpc64/power8/stpncpy.S +++ b/sysdeps/powerpc/powerpc64/power8/stpncpy.S @@ -18,3 +18,7 @@ #define USE_AS_STPNCPY #include <sysdeps/powerpc/powerpc64/power8/strncpy.S> + +weak_alias (__stpncpy, stpncpy) +libc_hidden_def (__stpncpy) +libc_hidden_builtin_def (stpncpy) diff --git a/sysdeps/powerpc/powerpc64/power8/strcasestr.S b/sysdeps/powerpc/powerpc64/power8/strcasestr.S index 24b2b76564..60015ae782 100644 --- a/sysdeps/powerpc/powerpc64/power8/strcasestr.S +++ b/sysdeps/powerpc/powerpc64/power8/strcasestr.S @@ -81,7 +81,7 @@ /* TODO: change this to .machine power8 when the minimum required binutils allows it. */ .machine power7 -EALIGN (strcasestr, 4, 0) +EALIGN (__strcasestr, 4, 0) CALL_MCOUNT 2 mflr r0 /* Load link register LR to r0. */ std r31, -8(r1) /* Save callers register r31. */ @@ -527,5 +527,8 @@ L(end): cfi_restore(r31) mtlr r0 /* Branch to link register. */ blr -END (strcasestr) +END (__strcasestr) + +weak_alias (__strcasestr, strcasestr) +libc_hidden_def (__strcasestr) libc_hidden_builtin_def (strcasestr) diff --git a/sysdeps/powerpc/powerpc64/power8/strncpy.S b/sysdeps/powerpc/powerpc64/power8/strncpy.S index 437edeb715..b7fae6d59a 100644 --- a/sysdeps/powerpc/powerpc64/power8/strncpy.S +++ b/sysdeps/powerpc/powerpc64/power8/strncpy.S @@ -24,6 +24,16 @@ # define FUNC_NAME strncpy #endif +#ifndef MEMSET +/* For builds without IFUNC support, local calls should be made to internal + GLIBC symbol (created by libc_hidden_builtin_def). */ +# ifdef SHARED +# define MEMSET __GI_memset +# else +# define MEMSET memset +# endif +#endif + #define FRAMESIZE (FRAME_MIN_SIZE+48) /* Implements the function @@ -223,7 +233,7 @@ L(zero_pad_start_1): stdu r1,-FRAMESIZE(r1) cfi_adjust_cfa_offset(FRAMESIZE) - bl __memset_power8 + bl MEMSET nop /* Restore the stack frame. */ @@ -442,8 +452,6 @@ L(zero_pad_start_prepare_1): b L(zero_pad_start_1) END (FUNC_NAME) -#ifdef USE_AS_STPNCPY -libc_hidden_def (__stpncpy) -#else +#ifndef USE_AS_STPNCPY libc_hidden_builtin_def (strncpy) #endif |