mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
df6cc7ee3b
The utf8-utf16-z9.c iconv module is using ifunc and thus the ifunc part should be in multiarch folder. Otherwise ifunc is used even if you configure with --disable-multi-arch. This patch moves the ifunc resolvers to the new file sysdeps/s390/multiarch/utf8-utf16-z9.c. The resolvers are now implemented with s390_libc_ifunc_expr macro instead of using gcc attribute ifunc directly. The ifunc versions are implemented in sysdeps/s390/utf8-utf16-z9.c. Each version is only implemented if needed or supported. Therefore there is a block at beginning of the file which selects the versions which should be defined depending on support for multiarch, vector-support and used minimum architecture level. This block defines HAVE_[FROM|TO]_[C|CU|VX] to 1 or 0. The code below is rearranged and surrounded by #if HAVE_[FROM|TO]_[C|CU|VX] == 1. There is no functional change. The cu instructions are z9 zarch instructions. As the major distros are already using the newer z196 as architecture level set, those instructions can be used as fallback version instead of the c-code. This behaviour is decided at compile time via HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT. ChangeLog: * sysdeps/s390/multiarch/utf8-utf16-z9.c: New File. * sysdeps/s390/utf8-utf16-z9.c: Move ifunc resolvers to multiarch folder and define ifunc versions depending on HAVE_[FROM|TO]_[C|CU|VX]. (HAVE_FROM_C, HAVE_FROM_CU, HAVE_FROM_VX, HAVE_TO_C, HAVE_TO_VX, FROM_LOOP_DEFAULT, FROM_LOOP_C, FROM_LOOP_CU, FROM_LOOP_VX, TO_LOOP_DEFAULT, TO_LOOP_C, TO_LOOP_VX): New Define.
49 lines
1.7 KiB
C
49 lines
1.7 KiB
C
/* Conversion between UTF-8 and UTF-16 - multiarch s390 version.
|
|
|
|
Copyright (C) 2017 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 <sysdeps/s390/utf8-utf16-z9.c>
|
|
#include <ifunc-resolve.h>
|
|
|
|
#undef FROM_LOOP
|
|
#define FROM_LOOP __from_utf8_loop
|
|
#undef TO_LOOP
|
|
#define TO_LOOP __to_utf8_loop
|
|
|
|
#define _SINGLE_NAME(NAME) NAME##_single
|
|
#define SINGLE_NAME(NAME) _SINGLE_NAME(NAME)
|
|
strong_alias (SINGLE_NAME (FROM_LOOP_DEFAULT), SINGLE_NAME (FROM_LOOP))
|
|
strong_alias (SINGLE_NAME (TO_LOOP_DEFAULT), SINGLE_NAME (TO_LOOP))
|
|
|
|
/* Generate ifunc'ed loop functions for FROM/TO_LOOP. */
|
|
s390_libc_ifunc_expr (FROM_LOOP_DEFAULT, FROM_LOOP,
|
|
(HAVE_FROM_VX && (hwcap & HWCAP_S390_VX))
|
|
? FROM_LOOP_VX
|
|
: (HAVE_FROM_CU && (hwcap & HWCAP_S390_ZARCH
|
|
&& hwcap & HWCAP_S390_HIGH_GPRS
|
|
&& hwcap & HWCAP_S390_ETF3EH))
|
|
? FROM_LOOP_CU
|
|
: FROM_LOOP_DEFAULT);
|
|
|
|
s390_libc_ifunc_expr (TO_LOOP_DEFAULT, TO_LOOP,
|
|
(HAVE_TO_VX && (hwcap & HWCAP_S390_VX))
|
|
? TO_LOOP_VX
|
|
: TO_LOOP_DEFAULT);
|
|
|
|
#include <iconv/skeleton.c>
|