mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 11:41:07 +00:00
18d6c45e12
This patch adjusts the s390 specific ifunc helper macros in ifunc-resolve.h to use the common __ifunc macro, which uses gcc attribute ifunc to get rid of the false debuginfo. Therefore the redirection construct is applied where needed. Perhaps in future we can switch some of the internal symbols __GI_* from the fallback variant to the ifunc function. But this change is not straightforward due to a segmentation fault while linking libc.so with older binutils on s390. ChangeLog: [BZ #20478] * sysdeps/s390/multiarch/ifunc-resolve.h (s390_vx_libc_ifunc2, s390_libc_ifunc): Use __ifunc from libc-symbols.h to create ifunc symbols. (s390_vx_libc_ifunc_init, s390_vx_libc_ifunc_redirected , s390_vx_libc_ifunc2_redirected, s390_libc_ifunc_init): New define. * sysdeps/s390/multiarch/memchr.c: Redirect ifunced function in header for using it as type for ifunc function. * sysdeps/s390/multiarch/mempcpy.c: Likewise. * sysdeps/s390/multiarch/rawmemchr.c: Likewise. * sysdeps/s390/multiarch/stpcpy.c: Likewise. * sysdeps/s390/multiarch/stpncpy.c: Likewise. * sysdeps/s390/multiarch/strcat.c: Likewise. * sysdeps/s390/multiarch/strchr.c: Likewise. * sysdeps/s390/multiarch/strcmp.c: Likewise. * sysdeps/s390/multiarch/strcpy.c: Likewise. * sysdeps/s390/multiarch/strcspn.c: Likewise. * sysdeps/s390/multiarch/strlen.c: Likewise. * sysdeps/s390/multiarch/strncmp.c: Likewise. * sysdeps/s390/multiarch/strncpy.c: Likewise. * sysdeps/s390/multiarch/strnlen.c: Likewise. * sysdeps/s390/multiarch/strpbrk.c: Likewise. * sysdeps/s390/multiarch/strrchr.c: Likewise. * sysdeps/s390/multiarch/strspn.c: Likewise. * sysdeps/s390/multiarch/wcschr.c: Likewise. * sysdeps/s390/multiarch/wcscmp.c: Likewise. * sysdeps/s390/multiarch/wcspbrk.c: Likewise. * sysdeps/s390/multiarch/wcsspn.c: Likewise. * sysdeps/s390/multiarch/wmemchr.c: Likewise. * sysdeps/s390/multiarch/wmemset.c: Likewise. * sysdeps/s390/s390-32/multiarch/memcmp.c: Likewise. * sysdeps/s390/s390-32/multiarch/memcpy.c: Likewise. * sysdeps/s390/s390-32/multiarch/memset.c: Likewise. * sysdeps/s390/s390-64/multiarch/memcmp.c: Likewise. * sysdeps/s390/s390-64/multiarch/memcpy.c: Likewise. * sysdeps/s390/s390-64/multiarch/memset.c: Likewise.
86 lines
3.5 KiB
C
86 lines
3.5 KiB
C
/* IFUNC resolver function for CPU specific functions.
|
|
32/64 bit S/390 version.
|
|
Copyright (C) 2015-2016 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 <unistd.h>
|
|
#include <dl-procinfo.h>
|
|
|
|
#define S390_STFLE_BITS_Z10 34 /* General instructions extension */
|
|
#define S390_STFLE_BITS_Z196 45 /* Distinct operands, pop ... */
|
|
|
|
#define S390_IS_Z196(STFLE_BITS) \
|
|
((STFLE_BITS & (1ULL << (63 - S390_STFLE_BITS_Z196))) != 0)
|
|
|
|
#define S390_IS_Z10(STFLE_BITS) \
|
|
((STFLE_BITS & (1ULL << (63 - S390_STFLE_BITS_Z10))) != 0)
|
|
|
|
#define S390_STORE_STFLE(STFLE_BITS) \
|
|
/* We want just 1 double word to be returned. */ \
|
|
register unsigned long reg0 __asm__("0") = 0; \
|
|
\
|
|
__asm__ __volatile__(".machine push" "\n\t" \
|
|
".machine \"z9-109\"" "\n\t" \
|
|
".machinemode \"zarch_nohighgprs\"\n\t" \
|
|
"stfle %0" "\n\t" \
|
|
".machine pop" "\n" \
|
|
: "=QS" (STFLE_BITS), "+d" (reg0) \
|
|
: : "cc");
|
|
#define s390_libc_ifunc_init() \
|
|
unsigned long long stfle_bits = 0ULL; \
|
|
if (__glibc_likely((dl_hwcap & HWCAP_S390_STFLE) \
|
|
&& (dl_hwcap & HWCAP_S390_ZARCH) \
|
|
&& (dl_hwcap & HWCAP_S390_HIGH_GPRS))) \
|
|
{ \
|
|
S390_STORE_STFLE (stfle_bits); \
|
|
}
|
|
|
|
#define s390_libc_ifunc(TYPE_FUNC, RESOLVERFUNC, FUNC) \
|
|
/* Make the declarations of the optimized functions hidden in order
|
|
to prevent GOT slots being generated for them. */ \
|
|
extern __typeof (TYPE_FUNC) RESOLVERFUNC##_z196 attribute_hidden; \
|
|
extern __typeof (TYPE_FUNC) RESOLVERFUNC##_z10 attribute_hidden; \
|
|
extern __typeof (TYPE_FUNC) RESOLVERFUNC##_default attribute_hidden; \
|
|
__ifunc (TYPE_FUNC, FUNC, \
|
|
__glibc_likely (S390_IS_Z196 (stfle_bits)) \
|
|
? RESOLVERFUNC##_z196 \
|
|
: __glibc_likely (S390_IS_Z10 (stfle_bits)) \
|
|
? RESOLVERFUNC##_z10 \
|
|
: RESOLVERFUNC##_default, \
|
|
unsigned long int dl_hwcap, s390_libc_ifunc_init);
|
|
|
|
#define s390_vx_libc_ifunc(FUNC) \
|
|
s390_vx_libc_ifunc2_redirected(FUNC, FUNC, FUNC)
|
|
|
|
#define s390_vx_libc_ifunc_redirected(TYPE_FUNC, FUNC) \
|
|
s390_vx_libc_ifunc2_redirected(TYPE_FUNC, FUNC, FUNC)
|
|
|
|
#define s390_vx_libc_ifunc2(RESOLVERFUNC, FUNC) \
|
|
s390_vx_libc_ifunc2_redirected(FUNC, RESOLVERFUNC, FUNC)
|
|
|
|
#define s390_vx_libc_ifunc_init()
|
|
#define s390_vx_libc_ifunc2_redirected(TYPE_FUNC, RESOLVERFUNC, FUNC) \
|
|
/* Make the declarations of the optimized functions hidden in order
|
|
to prevent GOT slots being generated for them. */ \
|
|
extern __typeof (TYPE_FUNC) RESOLVERFUNC##_vx attribute_hidden; \
|
|
extern __typeof (TYPE_FUNC) RESOLVERFUNC##_c attribute_hidden; \
|
|
__ifunc (TYPE_FUNC, FUNC, \
|
|
(dl_hwcap & HWCAP_S390_VX) \
|
|
? RESOLVERFUNC##_vx \
|
|
: RESOLVERFUNC##_c, \
|
|
unsigned long int dl_hwcap, s390_vx_libc_ifunc_init);
|