diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
| commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
| tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /sysdeps/s390/multiarch/strncmp.c | |
| parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'sysdeps/s390/multiarch/strncmp.c')
| -rw-r--r-- | sysdeps/s390/multiarch/strncmp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/s390/multiarch/strncmp.c b/sysdeps/s390/multiarch/strncmp.c index 9a72c79bfd..0ec472c3b0 100644 --- a/sysdeps/s390/multiarch/strncmp.c +++ b/sysdeps/s390/multiarch/strncmp.c @@ -1,5 +1,5 @@ /* Multiple versions of strncmp. - Copyright (C) 2015-2016 Free Software Foundation, Inc. + Copyright (C) 2015-2018 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 @@ -17,13 +17,14 @@ <http://www.gnu.org/licenses/>. */ #if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +# define strncmp __redirect_strncmp +/* Omit the strncmp inline definitions because it would redefine strncmp. */ +# define __NO_STRING_INLINES # include <string.h> +# undef strncmp # include <ifunc-resolve.h> - -# undef strcmp -extern __typeof (strncmp) __strncmp; -s390_vx_libc_ifunc2 (__strncmp, strncmp) +s390_vx_libc_ifunc2_redirected (__redirect_strncmp, __strncmp, strncmp) #else # include <string/strncmp.c> |