Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / sysdeps / s390 / strstr.c

diff --git a/sysdeps/s390/strstr.c b/sysdeps/s390/strstr.c
index f8432349a7254cc6208caf7ee4445fe54013f964..4e53d45780c3ef840517b6a07ccbeac62bf11c58 100644 (file)
--- a/sysdeps/s390/strstr.c
+++ b/sysdeps/s390/strstr.c
@@ -1,5 +1,5 @@
 /* Multiple versions of strstr.
-   Copyright (C) 2018 Free Software Foundation, Inc.
+   Copyright (C) 2018-2019 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
@@ -14,7 +14,7 @@
 
    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/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <ifunc-strstr.h>
 
@@ -32,8 +32,14 @@ extern __typeof (__redirect_strstr) STRSTR_C attribute_hidden;
 extern __typeof (__redirect_strstr) STRSTR_Z13 attribute_hidden;
 # endif
 
+# if HAVE_STRSTR_ARCH13
+extern __typeof (__redirect_strstr) STRSTR_ARCH13 attribute_hidden;
+# endif
+
 s390_libc_ifunc_expr (__redirect_strstr, strstr,
-                     (HAVE_STRSTR_Z13 && (hwcap & HWCAP_S390_VX))
+                     (HAVE_STRSTR_ARCH13 && (hwcap & HWCAP_S390_VXRS_EXT2))
+                     ? STRSTR_ARCH13
+                     : (HAVE_STRSTR_Z13 && (hwcap & HWCAP_S390_VX))
                      ? STRSTR_Z13
                      : STRSTR_DEFAULT
                      )