import glibc-2.28-189.1.el8

SOURCES/SUPPORTED

@@ -159,6 +159,7 @@ en_SG/ISO-8859-1 \
 en_US.UTF-8/UTF-8 \
 en_US/ISO-8859-1 \
 en_US.ISO-8859-15/ISO-8859-15 \
+en_US@ampm.UTF-8/UTF-8 \
 en_ZA.UTF-8/UTF-8 \
 en_ZA/ISO-8859-1 \
 en_ZM/UTF-8 \

SOURCES/glibc-rh1929928-1.patch

+This patch is a downstream-only variant of this upstream commit:
+
+commit 45b1e17e9150dbd9ac2d578579063fbfa8e1b327
+Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
+Date:   Thu Dec 17 10:03:05 2020 +0000
+
+    aarch64: use PTR_ARG and SIZE_ARG instead of DELOUSE
+    
+    DELOUSE was added to asm code to make them compatible with non-LP64
+    ABIs, but it is an unfortunate name and the code was not compatible
+    with ABIs where pointer and size_t are different. Glibc currently
+    only supports the LP64 ABI so these macros are not really needed or
+    tested, but for now the name is changed to be more meaningful instead
+    of removing them completely.
+    
+    Some DELOUSE macros were dropped: clone, strlen and strnlen used it
+    unnecessarily.
+    
+    The out of tree ILP32 patches are currently not maintained and will
+    likely need a rework to rebase them on top of the time64 changes.
+
+Keeping the DELOUSE macro avoids the need to update all string
+functions.  Lack of BTI markers and architecture variants cause many
+conflicts in a full upstream backport.
+
+diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
+index 5b30709436d3acea..1bcf15d4f18586ba 100644
+--- a/sysdeps/aarch64/sysdep.h
++++ b/sysdeps/aarch64/sysdep.h
+@@ -32,6 +32,8 @@
+ # define PTR_LOG_SIZE		2
+ # define DELOUSE(n)		mov     w##n, w##n
+ #endif
++#define PTR_ARG(n) DELOUSE(n)
++#define SIZE_ARG(n) DELOUSE(n)
+ 
+ #define PTR_SIZE	(1<<PTR_LOG_SIZE)
+ 

SOURCES/glibc-rh1929928-2.patch

+commit 77d175e14e5f4cf24e9579c03eef5d006a286316
+Author: Naohiro Tamura <naohirot@jp.fujitsu.com>
+Date:   Wed May 12 09:26:40 2021 +0000
+
+    config: Added HAVE_AARCH64_SVE_ASM for aarch64
+    
+    This patch checks if assembler supports '-march=armv8.2-a+sve' to
+    generate SVE code or not, and then define HAVE_AARCH64_SVE_ASM macro.
+
+Conflicts:
+	config.h.in
+	  (missing PAC+BTI support downstream, missing other ports)
+
+diff --git a/config.h.in b/config.h.in
+index 8520b0fa8d4668fb..94d5ea367e10f849 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -112,6 +112,11 @@
+ /* AArch64 big endian ABI */
+ #undef HAVE_AARCH64_BE
+ 
++/* Assembler support ARMv8.2-A SVE.
++   This macro becomes obsolete when glibc increased the minimum
++   required version of GNU 'binutils' to 2.28 or later. */
++#define HAVE_AARCH64_SVE_ASM 0
++
+ /* RISC-V integer ABI for ld.so.  */
+ #undef RISCV_ABI_XLEN
+ 
+diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure
+index f78a79338aba1e34..9fb713155d4ee6d8 100644
+--- a/sysdeps/aarch64/configure
++++ b/sysdeps/aarch64/configure
+@@ -212,3 +212,31 @@ fi
+ $as_echo "$libc_cv_aarch64_variant_pcs" >&6; }
+ config_vars="$config_vars
+ aarch64-variant-pcs = $libc_cv_aarch64_variant_pcs"
++
++# Check if asm support armv8.2-a+sve
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVE support in assembler" >&5
++$as_echo_n "checking for SVE support in assembler... " >&6; }
++if ${libc_cv_asm_sve+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat > conftest.s <<\EOF
++        ptrue p0.b
++EOF
++if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5'
++  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++  libc_cv_aarch64_sve_asm=yes
++else
++  libc_cv_aarch64_sve_asm=no
++fi
++rm -f conftest*
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_sve" >&5
++$as_echo "$libc_cv_asm_sve" >&6; }
++if test $libc_cv_aarch64_sve_asm = yes; then
++  $as_echo "#define HAVE_AARCH64_SVE_ASM 1" >>confdefs.h
++
++fi
+diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac
+index 7f13bfb93b60bfd7..0236cfcdf3c8d10d 100644
+--- a/sysdeps/aarch64/configure.ac
++++ b/sysdeps/aarch64/configure.ac
+@@ -42,3 +42,18 @@ EOF
+   fi
+   rm -rf conftest.*])
+ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs])
++
++# Check if asm support armv8.2-a+sve
++AC_CACHE_CHECK(for SVE support in assembler, libc_cv_asm_sve, [dnl
++cat > conftest.s <<\EOF
++        ptrue p0.b
++EOF
++if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then
++  libc_cv_aarch64_sve_asm=yes
++else
++  libc_cv_aarch64_sve_asm=no
++fi
++rm -f conftest*])
++if test $libc_cv_aarch64_sve_asm = yes; then
++  AC_DEFINE(HAVE_AARCH64_SVE_ASM)
++fi

SOURCES/glibc-rh1929928-3.patch

+commit 38560563587ad8eafa700c56800ff844f18fbad1
+Author: Naohiro Tamura <naohirot@fujitsu.com>
+Date:   Thu May 20 07:34:37 2021 +0000
+
+    aarch64: Added Vector Length Set test helper script
+    
+    This patch is a test helper script to change Vector Length for child
+    process. This script can be used as test-wrapper for 'make check'.
+    
+    Usage examples:
+    
+    ~/build$ make check subdirs=string \
+    test-wrapper='~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 16'
+    
+    ~/build$ ~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 16 \
+    make test t=string/test-memcpy
+    
+    ~/build$ ~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 32 \
+    ./debugglibc.sh string/test-memmove
+    
+    ~/build$ ~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 64 \
+    ./testrun.sh string/test-memset
+
+diff --git a/INSTALL b/INSTALL
+index 065565093bd76d5b..b3a4370f592c5047 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -387,6 +387,10 @@ the same syntax as 'test-wrapper-env', the only difference in its
+ semantics being starting with an empty set of environment variables
+ rather than the ambient set.
+ 
++   For AArch64 with SVE, when testing the GNU C Library, 'test-wrapper'
++may be set to "SRCDIR/sysdeps/unix/sysv/linux/aarch64/vltest.py
++VECTOR-LENGTH" to change Vector Length.
++
+ Installing the C Library
+ ========================
+ 
+diff --git a/manual/install.texi b/manual/install.texi
+index 7e9f2be150e6f98a..c262fd56d0cef67b 100644
+--- a/manual/install.texi
++++ b/manual/install.texi
+@@ -425,6 +425,9 @@ use has the same syntax as @samp{test-wrapper-env}, the only
+ difference in its semantics being starting with an empty set of
+ environment variables rather than the ambient set.
+ 
++For AArch64 with SVE, when testing @theglibc{}, @samp{test-wrapper}
++may be set to "@var{srcdir}/sysdeps/unix/sysv/linux/aarch64/vltest.py
++@var{vector-length}" to change Vector Length.
+ 
+ @node Running make install
+ @appendixsec Installing the C Library
+diff --git a/sysdeps/unix/sysv/linux/aarch64/vltest.py b/sysdeps/unix/sysv/linux/aarch64/vltest.py
+new file mode 100755
+index 0000000000000000..bed62ad151e06868
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/aarch64/vltest.py
+@@ -0,0 +1,82 @@
++#!/usr/bin/python3
++# Set Scalable Vector Length test helper
++# Copyright (C) 2021 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
++# <https://www.gnu.org/licenses/>.
++"""Set Scalable Vector Length test helper.
++
++Set Scalable Vector Length for child process.
++
++examples:
++
++~/build$ make check subdirs=string \
++test-wrapper='~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 16'
++
++~/build$ ~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 16 \
++make test t=string/test-memcpy
++
++~/build$ ~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 32 \
++./debugglibc.sh string/test-memmove
++
++~/build$ ~/glibc/sysdeps/unix/sysv/linux/aarch64/vltest.py 64 \
++./testrun.sh string/test-memset
++"""
++import argparse
++from ctypes import cdll, CDLL
++import os
++import sys
++
++EXIT_SUCCESS = 0
++EXIT_FAILURE = 1
++EXIT_UNSUPPORTED = 77
++
++AT_HWCAP = 16
++HWCAP_SVE = (1 << 22)
++
++PR_SVE_GET_VL = 51
++PR_SVE_SET_VL = 50
++PR_SVE_SET_VL_ONEXEC = (1 << 18)
++PR_SVE_VL_INHERIT = (1 << 17)
++PR_SVE_VL_LEN_MASK = 0xffff
++
++def main(args):
++    libc = CDLL("libc.so.6")
++    if not libc.getauxval(AT_HWCAP) & HWCAP_SVE:
++        print("CPU doesn't support SVE")
++        sys.exit(EXIT_UNSUPPORTED)
++
++    libc.prctl(PR_SVE_SET_VL,
++               args.vl[0] | PR_SVE_SET_VL_ONEXEC | PR_SVE_VL_INHERIT)
++    os.execvp(args.args[0], args.args)
++    print("exec system call failure")
++    sys.exit(EXIT_FAILURE)
++
++if __name__ == '__main__':
++    parser = argparse.ArgumentParser(description=
++            "Set Scalable Vector Length test helper",
++            formatter_class=argparse.ArgumentDefaultsHelpFormatter)
++
++    # positional argument
++    parser.add_argument("vl", nargs=1, type=int,
++                        choices=range(16, 257, 16),
++                        help=('vector length '\
++                              'which is multiples of 16 from 16 to 256'))
++    # remainDer arguments
++    parser.add_argument('args', nargs=argparse.REMAINDER,
++                        help=('args '\
++                              'which is passed to child process'))
++    args = parser.parse_args()
++    main(args)

SOURCES/glibc-rh1929928-5.patch

+commit 4f26956d5ba394eb3ade6c1c20b5c16864a00766
+Author: Naohiro Tamura <naohirot@jp.fujitsu.com>
+Date:   Thu May 27 07:44:12 2021 +0000
+
+    aarch64: Added optimized memset for A64FX
+    
+    This patch optimizes the performance of memset for A64FX [1] which
+    implements ARMv8-A SVE and has L1 64KB cache per core and L2 8MB cache
+    per NUMA node.
+    
+    The performance optimization makes use of Scalable Vector Register
+    with several techniques such as loop unrolling, memory access
+    alignment, cache zero fill and prefetch.
+    
+    SVE assembler code for memset is implemented as Vector Length Agnostic
+    code so theoretically it can be run on any SOC which supports ARMv8-A
+    SVE standard.
+    
+    We confirmed that all testcases have been passed by running 'make
+    check' and 'make xcheck' not only on A64FX but also on ThunderX2.
+    
+    And also we confirmed that the SVE 512 bit vector register performance
+    is roughly 4 times better than Advanced SIMD 128 bit register and 8
+    times better than scalar 64 bit register by running 'make bench'.
+    
+    [1] https://github.com/fujitsu/A64FX
+    
+    Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
+    Reviewed-by: Szabolcs Nagy <Szabolcs.Nagy@arm.com>
+
+Conflicts:
+	sysdeps/aarch64/multiarch/Makefile
+	sysdeps/aarch64/multiarch/ifunc-impl-list.c
+	sysdeps/aarch64/multiarch/memset.c
+	  (all conflicts due to missing other CPU implementations downstream)
+
+diff --git a/sysdeps/aarch64/multiarch/Makefile b/sysdeps/aarch64/multiarch/Makefile
+index 5a19ba0308e80983..5ff883a8ad8e3067 100644
+--- a/sysdeps/aarch64/multiarch/Makefile
++++ b/sysdeps/aarch64/multiarch/Makefile
+@@ -1,5 +1,6 @@
+ ifeq ($(subdir),string)
+ sysdep_routines += memcpy_generic memcpy_thunderx memcpy_thunderx2 \
+ 		   memcpy_falkor memcpy_a64fx \
+-		   memmove_falkor memset_generic memset_falkor
++		   memmove_falkor memset_generic memset_falkor \
++		   memset_a64fx
+ endif
+diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+index f53db12acce37877..53e3e162a1025e40 100644
+--- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+@@ -37,7 +37,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+ 
+   INIT_ARCH ();
+ 
+-  /* Support sysdeps/aarch64/multiarch/memcpy.c and memmove.c.  */
++  /* Support sysdeps/aarch64/multiarch/memcpy.c, memmove.c and memset.c.  */
+   IFUNC_IMPL (i, name, memcpy,
+ 	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_thunderx)
+ 	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_thunderx2)
+@@ -57,6 +57,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+ 	      /* Enable this on non-falkor processors too so that other cores
+ 		 can do a comparative analysis with __memset_generic.  */
+ 	      IFUNC_IMPL_ADD (array, i, memset, (zva_size == 64), __memset_falkor)
++#if HAVE_AARCH64_SVE_ASM
++	      IFUNC_IMPL_ADD (array, i, memset, sve, __memset_a64fx)
++#endif
+ 	      IFUNC_IMPL_ADD (array, i, memset, 1, __memset_generic))
+ 
+   return i;
+diff --git a/sysdeps/aarch64/multiarch/memset.c b/sysdeps/aarch64/multiarch/memset.c
+index d74ed3a549a54b10..2c8cc72bb0b18474 100644
+--- a/sysdeps/aarch64/multiarch/memset.c
++++ b/sysdeps/aarch64/multiarch/memset.c
+@@ -29,12 +29,21 @@
+ extern __typeof (__redirect_memset) __libc_memset;
+ 
+ extern __typeof (__redirect_memset) __memset_falkor attribute_hidden;
++# if HAVE_AARCH64_SVE_ASM
++extern __typeof (__redirect_memset) __memset_a64fx attribute_hidden;
++# endif
+ extern __typeof (__redirect_memset) __memset_generic attribute_hidden;
+ 
+ libc_ifunc (__libc_memset,
+ 	    ((IS_FALKOR (midr) || IS_PHECDA (midr)) && zva_size == 64
+ 	     ? __memset_falkor
++# if HAVE_AARCH64_SVE_ASM
++	     : (IS_A64FX (midr)
++		? __memset_a64fx
++		: __memset_generic)));
++# else
+ 	     : __memset_generic));
++# endif
+ 
+ # undef memset
+ strong_alias (__libc_memset, memset);
+diff --git a/sysdeps/aarch64/multiarch/memset_a64fx.S b/sysdeps/aarch64/multiarch/memset_a64fx.S
+new file mode 100644
+index 0000000000000000..ce54e5418b08c8bc
+--- /dev/null
++++ b/sysdeps/aarch64/multiarch/memset_a64fx.S
+@@ -0,0 +1,268 @@
++/* Optimized memset for Fujitsu A64FX processor.
++   Copyright (C) 2021 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
++   <https://www.gnu.org/licenses/>.  */
++
++#include <sysdep.h>
++#include <sysdeps/aarch64/memset-reg.h>
++
++/* Assumptions:
++ *
++ * ARMv8.2-a, AArch64, unaligned accesses, sve
++ *
++ */
++
++#define L1_SIZE		(64*1024)	// L1 64KB
++#define L2_SIZE         (8*1024*1024)	// L2 8MB - 1MB
++#define CACHE_LINE_SIZE	256
++#define PF_DIST_L1	(CACHE_LINE_SIZE * 16)	// Prefetch distance L1
++#define ZF_DIST		(CACHE_LINE_SIZE * 21)	// Zerofill distance
++#define rest		x8
++#define vector_length	x9
++#define vl_remainder	x10	// vector_length remainder
++#define cl_remainder	x11	// CACHE_LINE_SIZE remainder
++
++#if HAVE_AARCH64_SVE_ASM
++# if IS_IN (libc)
++#  define MEMSET __memset_a64fx
++
++	.arch armv8.2-a+sve
++
++	.macro dc_zva times
++	dc	zva, tmp1
++	add	tmp1, tmp1, CACHE_LINE_SIZE
++	.if \times-1
++	dc_zva "(\times-1)"
++	.endif
++	.endm
++
++	.macro st1b_unroll first=0, last=7
++	st1b	z0.b, p0, [dst, #\first, mul vl]
++	.if \last-\first
++	st1b_unroll "(\first+1)", \last
++	.endif
++	.endm
++
++	.macro shortcut_for_small_size exit
++	// if rest <= vector_length * 2
++	whilelo	p0.b, xzr, count
++	whilelo	p1.b, vector_length, count
++	b.last	1f
++	st1b	z0.b, p0, [dstin, #0, mul vl]
++	st1b	z0.b, p1, [dstin, #1, mul vl]
++	ret
++1:	// if rest > vector_length * 8
++	cmp	count, vector_length, lsl 3	// vector_length * 8
++	b.hi	\exit
++	// if rest <= vector_length * 4
++	lsl	tmp1, vector_length, 1	// vector_length * 2
++	whilelo	p2.b, tmp1, count
++	incb	tmp1
++	whilelo	p3.b, tmp1, count
++	b.last	1f
++	st1b	z0.b, p0, [dstin, #0, mul vl]
++	st1b	z0.b, p1, [dstin, #1, mul vl]
++	st1b	z0.b, p2, [dstin, #2, mul vl]
++	st1b	z0.b, p3, [dstin, #3, mul vl]
++	ret
++1:	// if rest <= vector_length * 8
++	lsl	tmp1, vector_length, 2	// vector_length * 4
++	whilelo	p4.b, tmp1, count
++	incb	tmp1
++	whilelo	p5.b, tmp1, count
++	b.last	1f
++	st1b	z0.b, p0, [dstin, #0, mul vl]
++	st1b	z0.b, p1, [dstin, #1, mul vl]
++	st1b	z0.b, p2, [dstin, #2, mul vl]
++	st1b	z0.b, p3, [dstin, #3, mul vl]
++	st1b	z0.b, p4, [dstin, #4, mul vl]
++	st1b	z0.b, p5, [dstin, #5, mul vl]
++	ret
++1:	lsl	tmp1, vector_length, 2	// vector_length * 4
++	incb	tmp1			// vector_length * 5
++	incb	tmp1			// vector_length * 6
++	whilelo	p6.b, tmp1, count
++	incb	tmp1
++	whilelo	p7.b, tmp1, count
++	st1b	z0.b, p0, [dstin, #0, mul vl]
++	st1b	z0.b, p1, [dstin, #1, mul vl]
++	st1b	z0.b, p2, [dstin, #2, mul vl]
++	st1b	z0.b, p3, [dstin, #3, mul vl]
++	st1b	z0.b, p4, [dstin, #4, mul vl]
++	st1b	z0.b, p5, [dstin, #5, mul vl]
++	st1b	z0.b, p6, [dstin, #6, mul vl]
++	st1b	z0.b, p7, [dstin, #7, mul vl]
++	ret
++	.endm
++
++ENTRY (MEMSET)
++
++	PTR_ARG (0)
++	SIZE_ARG (2)
++
++	cbnz	count, 1f
++	ret
++1:	dup	z0.b, valw
++	cntb	vector_length
++	// shortcut for less than vector_length * 8
++	// gives a free ptrue to p0.b for n >= vector_length
++	shortcut_for_small_size L(vl_agnostic)
++	// end of shortcut
++
++L(vl_agnostic): // VL Agnostic
++	mov	rest, count
++	mov	dst, dstin
++	add	dstend, dstin, count
++	// if rest >= L2_SIZE && vector_length == 64 then L(L2)
++	mov	tmp1, 64
++	cmp	rest, L2_SIZE
++	ccmp	vector_length, tmp1, 0, cs
++	b.eq	L(L2)
++	// if rest >= L1_SIZE && vector_length == 64 then L(L1_prefetch)
++	cmp	rest, L1_SIZE
++	ccmp	vector_length, tmp1, 0, cs
++	b.eq	L(L1_prefetch)
++
++L(unroll32):
++	lsl	tmp1, vector_length, 3	// vector_length * 8
++	lsl	tmp2, vector_length, 5	// vector_length * 32
++	.p2align 3
++1:	cmp	rest, tmp2
++	b.cc	L(unroll8)
++	st1b_unroll
++	add	dst, dst, tmp1
++	st1b_unroll
++	add	dst, dst, tmp1
++	st1b_unroll
++	add	dst, dst, tmp1
++	st1b_unroll
++	add	dst, dst, tmp1
++	sub	rest, rest, tmp2
++	b	1b
++
++L(unroll8):
++	lsl	tmp1, vector_length, 3
++	.p2align 3
++1:	cmp	rest, tmp1
++	b.cc	L(last)
++	st1b_unroll
++	add	dst, dst, tmp1
++	sub	rest, rest, tmp1
++	b	1b
++
++L(last):
++	whilelo	p0.b, xzr, rest
++	whilelo	p1.b, vector_length, rest
++	b.last	1f
++	st1b	z0.b, p0, [dst, #0, mul vl]
++	st1b	z0.b, p1, [dst, #1, mul vl]
++	ret
++1:	lsl	tmp1, vector_length, 1	// vector_length * 2
++	whilelo	p2.b, tmp1, rest
++	incb	tmp1
++	whilelo	p3.b, tmp1, rest
++	b.last	1f
++	st1b	z0.b, p0, [dst, #0, mul vl]
++	st1b	z0.b, p1, [dst, #1, mul vl]
++	st1b	z0.b, p2, [dst, #2, mul vl]
++	st1b	z0.b, p3, [dst, #3, mul vl]
++	ret
++1:	lsl	tmp1, vector_length, 2	// vector_length * 4
++	whilelo	p4.b, tmp1, rest
++	incb	tmp1
++	whilelo	p5.b, tmp1, rest
++	incb	tmp1
++	whilelo	p6.b, tmp1, rest
++	incb	tmp1
++	whilelo	p7.b, tmp1, rest
++	st1b	z0.b, p0, [dst, #0, mul vl]
++	st1b	z0.b, p1, [dst, #1, mul vl]
++	st1b	z0.b, p2, [dst, #2, mul vl]
++	st1b	z0.b, p3, [dst, #3, mul vl]
++	st1b	z0.b, p4, [dst, #4, mul vl]
++	st1b	z0.b, p5, [dst, #5, mul vl]
++	st1b	z0.b, p6, [dst, #6, mul vl]
++	st1b	z0.b, p7, [dst, #7, mul vl]
++	ret
++
++L(L1_prefetch): // if rest >= L1_SIZE
++	.p2align 3
++1:	st1b_unroll 0, 3
++	prfm	pstl1keep, [dst, PF_DIST_L1]
++	st1b_unroll 4, 7
++	prfm	pstl1keep, [dst, PF_DIST_L1 + CACHE_LINE_SIZE]
++	add	dst, dst, CACHE_LINE_SIZE * 2
++	sub	rest, rest, CACHE_LINE_SIZE * 2
++	cmp	rest, L1_SIZE
++	b.ge	1b
++	cbnz	rest, L(unroll32)
++	ret
++
++L(L2):
++	// align dst address at vector_length byte boundary
++	sub	tmp1, vector_length, 1
++	ands	tmp2, dst, tmp1
++	// if vl_remainder == 0
++	b.eq	1f
++	sub	vl_remainder, vector_length, tmp2
++	// process remainder until the first vector_length boundary
++	whilelt	p2.b, xzr, vl_remainder
++	st1b	z0.b, p2, [dst]
++	add	dst, dst, vl_remainder
++	sub	rest, rest, vl_remainder
++	// align dstin address at CACHE_LINE_SIZE byte boundary
++1:	mov	tmp1, CACHE_LINE_SIZE
++	ands	tmp2, dst, CACHE_LINE_SIZE - 1
++	// if cl_remainder == 0
++	b.eq	L(L2_dc_zva)
++	sub	cl_remainder, tmp1, tmp2
++	// process remainder until the first CACHE_LINE_SIZE boundary
++	mov	tmp1, xzr       // index
++2:	whilelt	p2.b, tmp1, cl_remainder
++	st1b	z0.b, p2, [dst, tmp1]
++	incb	tmp1
++	cmp	tmp1, cl_remainder
++	b.lo	2b
++	add	dst, dst, cl_remainder
++	sub	rest, rest, cl_remainder
++
++L(L2_dc_zva):
++	// zero fill
++	mov	tmp1, dst
++	dc_zva	(ZF_DIST / CACHE_LINE_SIZE) - 1
++	mov	zva_len, ZF_DIST
++	add	tmp1, zva_len, CACHE_LINE_SIZE * 2
++	// unroll
++	.p2align 3
++1:	st1b_unroll 0, 3
++	add	tmp2, dst, zva_len
++	dc	 zva, tmp2
++	st1b_unroll 4, 7
++	add	tmp2, tmp2, CACHE_LINE_SIZE
++	dc	zva, tmp2
++	add	dst, dst, CACHE_LINE_SIZE * 2
++	sub	rest, rest, CACHE_LINE_SIZE * 2
++	cmp	rest, tmp1	// ZF_DIST + CACHE_LINE_SIZE * 2
++	b.ge	1b
++	cbnz	rest, L(unroll8)
++	ret
++
++END (MEMSET)
++libc_hidden_builtin_def (MEMSET)
++
++#endif /* IS_IN (libc) */
++#endif /* HAVE_AARCH64_SVE_ASM */

SOURCES/glibc-rh1934162-1.patch

+From 332421312576bd7095e70589154af99b124dd2d1 Mon Sep 17 00:00:00 2001
+From: Carlos O'Donell <carlos@redhat.com>
+Date: Fri, 12 Mar 2021 16:44:47 +0100
+Subject: elf: Always set l in _dl_init_paths (bug 23462)
+
+After d1d5471579eb0426671bf94f2d71e61dfb204c30 ("Remove dead
+DL_DST_REQ_STATIC code.") we always setup the link map l to make the
+static and shared cases the same.  The bug is that in elf/dl-load.c
+(_dl_init_paths) we conditionally set l only in the #ifdef SHARED
+case, but unconditionally use it later.  The simple solution is to
+remove the #ifdef SHARED conditional, because it's no longer needed,
+and unconditionally setup l for both the static and shared cases. A
+regression test is added to run a static binary with
+LD_LIBRARY_PATH='$ORIGIN' which crashes before the fix and runs after
+the fix.
+
+Co-Authored-By: Florian Weimer <fweimer@redhat.com>
+
+diff --git a/elf/Makefile b/elf/Makefile
+--- a/elf/Makefile	2021-11-02 16:28:14.720143774 -0400
++++ b/elf/Makefile	2021-11-02 18:42:38.763843571 -0400
+@@ -151,7 +151,8 @@ endif
+ tests-static-normal := tst-leaks1-static tst-array1-static tst-array5-static \
+ 	       tst-dl-iter-static \
+ 	       tst-tlsalign-static tst-tlsalign-extern-static \
+-	       tst-linkall-static tst-env-setuid tst-env-setuid-tunables
++	       tst-linkall-static tst-env-setuid tst-env-setuid-tunables \
++	       tst-dst-static
+ tests-static-internal := tst-tls1-static tst-tls2-static \
+ 	       tst-ptrguard1-static tst-stackguard1-static \
+ 	       tst-tls1-static-non-pie tst-libc_dlvsym-static
+@@ -1811,3 +1812,5 @@ $(objpfx)tst-glibc-hwcaps-mask.out: \
+ # Generic dependency for sysdeps implementation of
+ # tst-glibc-hwcaps-cache.
+ $(objpfx)tst-glibc-hwcaps-cache.out: $(objpfx)tst-glibc-hwcaps
++
++tst-dst-static-ENV = LD_LIBRARY_PATH='$$ORIGIN'
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index 9e2089cfaa..376a2e64d6 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -758,50 +758,45 @@ _dl_init_paths (const char *llp, const char *source,
+   max_dirnamelen = SYSTEM_DIRS_MAX_LEN;
+   *aelem = NULL;
+ 
+-#ifdef SHARED
+   /* This points to the map of the main object.  */
+   l = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
+-  if (l != NULL)
++  assert (l->l_type != lt_loaded);
++
++  if (l->l_info[DT_RUNPATH])
++    {
++      /* Allocate room for the search path and fill in information
++	 from RUNPATH.  */
++      decompose_rpath (&l->l_runpath_dirs,
++		       (const void *) (D_PTR (l, l_info[DT_STRTAB])
++				       + l->l_info[DT_RUNPATH]->d_un.d_val),
++		       l, "RUNPATH");
++      /* During rtld init the memory is allocated by the stub malloc,
++	 prevent any attempt to free it by the normal malloc.  */
++      l->l_runpath_dirs.malloced = 0;
++
++      /* The RPATH is ignored.  */
++      l->l_rpath_dirs.dirs = (void *) -1;
++    }
++  else
+     {
+-      assert (l->l_type != lt_loaded);
++      l->l_runpath_dirs.dirs = (void *) -1;
+ 
+-      if (l->l_info[DT_RUNPATH])
++      if (l->l_info[DT_RPATH])
+ 	{
+ 	  /* Allocate room for the search path and fill in information
+-	     from RUNPATH.  */
+-	  decompose_rpath (&l->l_runpath_dirs,
++	     from RPATH.  */
++	  decompose_rpath (&l->l_rpath_dirs,
+ 			   (const void *) (D_PTR (l, l_info[DT_STRTAB])
+-					   + l->l_info[DT_RUNPATH]->d_un.d_val),
+-			   l, "RUNPATH");
+-	  /* During rtld init the memory is allocated by the stub malloc,
+-	     prevent any attempt to free it by the normal malloc.  */
+-	  l->l_runpath_dirs.malloced = 0;
+-
+-	  /* The RPATH is ignored.  */
+-	  l->l_rpath_dirs.dirs = (void *) -1;
++					   + l->l_info[DT_RPATH]->d_un.d_val),
++			   l, "RPATH");
++	  /* During rtld init the memory is allocated by the stub
++	     malloc, prevent any attempt to free it by the normal
++	     malloc.  */
++	  l->l_rpath_dirs.malloced = 0;
+ 	}
+       else
+-	{
+-	  l->l_runpath_dirs.dirs = (void *) -1;
+-
+-	  if (l->l_info[DT_RPATH])
+-	    {
+-	      /* Allocate room for the search path and fill in information
+-		 from RPATH.  */
+-	      decompose_rpath (&l->l_rpath_dirs,
+-			       (const void *) (D_PTR (l, l_info[DT_STRTAB])
+-					       + l->l_info[DT_RPATH]->d_un.d_val),
+-			       l, "RPATH");
+-	      /* During rtld init the memory is allocated by the stub
+-		 malloc, prevent any attempt to free it by the normal
+-		 malloc.  */
+-	      l->l_rpath_dirs.malloced = 0;
+-	    }
+-	  else
+-	    l->l_rpath_dirs.dirs = (void *) -1;
+-	}
++	l->l_rpath_dirs.dirs = (void *) -1;
+     }
+-#endif	/* SHARED */
+ 
+   if (llp != NULL && *llp != '\0')
+     {
+diff --git a/elf/tst-dst-static.c b/elf/tst-dst-static.c
+new file mode 100644
+index 0000000000..56eb371c96
+--- /dev/null
++++ b/elf/tst-dst-static.c
+@@ -0,0 +1,32 @@
++/* Test DST expansion for static binaries doesn't carsh.  Bug 23462.
++   Copyright (C) 2021 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
++   <https://www.gnu.org/licenses/>.  */
++
++/* The purpose of this test is to exercise the code in elf/dl-loac.c
++   (_dl_init_paths) or thereabout and ensure that static binaries
++   don't crash when expanding DSTs.
++
++   If the dynamic loader code linked into the static binary cannot
++   handle expanding the DSTs e.g. null-deref on an incomplete link
++   map, then it will crash before reaching main, so the test harness
++   is unnecessary.  */
++
++int
++main (void)
++{
++  return 0;
++}

SOURCES/glibc-rh1934162-2.patch

+From 4e6db99c665d3b82a70a3e218860ef087b1555b4 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 15 Mar 2021 10:33:43 +0100
+Subject: elf: ld.so --help calls _dl_init_paths without a main map [BZ #27577]
+
+In this case, use the link map of the dynamic loader itself as
+a replacement.  This is more than just a hack: if we ever support
+DT_RUNPATH/DT_RPATH for the dynamic loader, reporting it for
+ld.so --help (without further command line arguments) would be the
+right thing to do.
+
+Fixes commit 332421312576bd7095e70589154af99b124dd2d1 ("elf: Always
+set l in _dl_init_paths (bug 23462)").
+
+diff --git a/elf/Makefile b/elf/Makefile
+index 4c9e63dac9..ba4689a7fa 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -231,7 +231,7 @@ tests += $(tests-execstack-$(have-z-execstack))
+ ifeq ($(run-built-tests),yes)
+ tests-special += $(objpfx)tst-leaks1-mem.out \
+ 		 $(objpfx)tst-leaks1-static-mem.out $(objpfx)noload-mem.out \
+-		 $(objpfx)tst-ldconfig-X.out
++		 $(objpfx)tst-ldconfig-X.out $(objpfx)tst-rtld-help.out
+ endif
+ tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+ tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+@@ -409,7 +409,8 @@ endif
+ ifeq (yes,$(build-shared))
+ ifeq ($(run-built-tests),yes)
+ tests-special += $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out \
+-		 $(objpfx)tst-rtld-preload.out $(objpfx)argv0test.out
++		 $(objpfx)tst-rtld-preload.out $(objpfx)argv0test.out \
++		 $(objpfx)tst-rtld-help.out
+ endif
+ tests-special += $(objpfx)check-textrel.out $(objpfx)check-execstack.out \
+ 		 $(objpfx)check-wx-segment.out \
+@@ -1814,3 +1815,16 @@ $(objpfx)list-tunables.out: tst-rtld-list-tunables.sh $(objpfx)ld.so
+ $(objpfx)tst-glibc-hwcaps-cache.out: $(objpfx)tst-glibc-hwcaps
+ 
+ tst-dst-static-ENV = LD_LIBRARY_PATH='$$ORIGIN'
++
++$(objpfx)tst-rtld-help.out: $(objpfx)ld.so
++	$(test-wrapper) $(rtld-prefix) --help > $@; \
++	status=$$?; \
++	echo "info: ld.so exit status: $$status" >> $@; \
++	if ! grep -q 'Legacy HWCAP subdirectories under library search path directories' $@; then \
++	  echo "error: missing subdirectory pattern" >> $@; \
++	  if test $$status -eq 0; then \
++	    status=1; \
++	  fi; \
++	fi; \
++	(exit $$status); \
++	$(evaluate-test)
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index 376a2e64d6..2f760503c5 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -758,8 +758,14 @@ _dl_init_paths (const char *llp, const char *source,
+   max_dirnamelen = SYSTEM_DIRS_MAX_LEN;
+   *aelem = NULL;
+ 
+-  /* This points to the map of the main object.  */
++  /* This points to the map of the main object.  If there is no main
++     object (e.g., under --help, use the dynamic loader itself as a
++     stand-in.  */
+   l = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
++#ifdef SHARED
++  if (l == NULL)
++    l = &GL (dl_rtld_map);
++#endif
+   assert (l->l_type != lt_loaded);
+ 
+   if (l->l_info[DT_RUNPATH])

SOURCES/glibc-rh1937515.patch

+Based on the following commit, adjusted for glibc-2.28 in RHEL-8:
+
+commit 27f74636752d0c4438cf8346cf2a76b6fcf3be16
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Fri Mar 19 06:15:37 2021 -0700
+
+    x86: Properly disable XSAVE related features [BZ #27605]
+    
+    1. Support GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVE.
+    2. Disable all features which depend on XSAVE:
+       a. If OSXSAVE is disabled by glibc tunables.  Or
+       b. If both XSAVE and XSAVEC aren't usable.
+
+diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
+index 805d00a43309fc23..910425053d9e226f 100644
+--- a/sysdeps/x86/cpu-features.c
++++ b/sysdeps/x86/cpu-features.c
+@@ -654,6 +654,60 @@ no_cpuid:
+     = TUNABLE_GET (x86_data_cache_size, long int, NULL);
+   cpu_features->shared_cache_size
+     = TUNABLE_GET (x86_shared_cache_size, long int, NULL);
++
++  bool disable_xsave_features = false;
++
++  if (!CPU_FEATURE_USABLE_P (cpu_features, OSXSAVE))
++    {
++      /* These features are usable only if OSXSAVE is usable.  */
++      CPU_FEATURE_UNSET (cpu_features, XSAVE);
++      CPU_FEATURE_UNSET (cpu_features, XSAVEOPT);
++      CPU_FEATURE_UNSET (cpu_features, XSAVEC);
++      CPU_FEATURE_UNSET (cpu_features, XGETBV_ECX_1);
++      CPU_FEATURE_UNSET (cpu_features, XFD);
++
++      disable_xsave_features = true;
++    }
++
++  if (disable_xsave_features
++      || (!CPU_FEATURE_USABLE_P (cpu_features, XSAVE)
++	  && !CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)))
++    {
++      /* Clear xsave_state_size if both XSAVE and XSAVEC aren't usable.  */
++      cpu_features->xsave_state_size = 0;
++
++      CPU_FEATURE_UNSET (cpu_features, AVX);
++      CPU_FEATURE_UNSET (cpu_features, AVX2);
++      CPU_FEATURE_UNSET (cpu_features, AVX_VNNI);
++      CPU_FEATURE_UNSET (cpu_features, FMA);
++      CPU_FEATURE_UNSET (cpu_features, VAES);
++      CPU_FEATURE_UNSET (cpu_features, VPCLMULQDQ);
++      CPU_FEATURE_UNSET (cpu_features, XOP);
++      CPU_FEATURE_UNSET (cpu_features, F16C);
++      CPU_FEATURE_UNSET (cpu_features, AVX512F);
++      CPU_FEATURE_UNSET (cpu_features, AVX512CD);
++      CPU_FEATURE_UNSET (cpu_features, AVX512ER);
++      CPU_FEATURE_UNSET (cpu_features, AVX512PF);
++      CPU_FEATURE_UNSET (cpu_features, AVX512VL);
++      CPU_FEATURE_UNSET (cpu_features, AVX512DQ);
++      CPU_FEATURE_UNSET (cpu_features, AVX512BW);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_4FMAPS);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_4VNNIW);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_BITALG);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_IFMA);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_VBMI);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_VBMI2);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_VNNI);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_VPOPCNTDQ);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_VP2INTERSECT);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_BF16);
++      CPU_FEATURE_UNSET (cpu_features, AVX512_FP16);
++      CPU_FEATURE_UNSET (cpu_features, AMX_BF16);
++      CPU_FEATURE_UNSET (cpu_features, AMX_TILE);
++      CPU_FEATURE_UNSET (cpu_features, AMX_INT8);
++
++      CPU_FEATURE_UNSET (cpu_features, FMA4);
++    }
+ #endif
+ 
+   /* Reuse dl_platform, dl_hwcap and dl_hwcap_mask for x86.  */
+diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c
+index 0728023007a0f423..3173b2b959ca88f9 100644
+--- a/sysdeps/x86/cpu-tunables.c
++++ b/sysdeps/x86/cpu-tunables.c
+@@ -168,6 +168,7 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, MOVBE, 5);
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SHSTK, 5);
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSSE3, 5);
++	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, XSAVE, 5);
+ 	    }
+ 	  break;
+ 	case 6:

SOURCES/glibc-rh1971664-1.patch

+commit 0c78b0bb78d87a7de18726a033d88904f158f0fe
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Mon Jun 7 14:22:17 2021 +0530
+
+    iconvconfig: Make file handling more general purpose
+    
+    Split out configuration file handling code from handle_dir into its
+    own function so that it can be reused for multiple configuration
+    files.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
+index b6fef1553cbbdd3d..2b3c587bc77cfdcd 100644
+--- a/iconv/iconvconfig.c
++++ b/iconv/iconvconfig.c
+@@ -644,37 +644,17 @@ add_module (char *rp, const char *directory)
+ 	      cost, need_ext);
+ }
+ 
+-
+-/* Read the config file and add the data for this directory to that.  */
+-static int
+-handle_dir (const char *dir)
++/* Read a gconv-modules configuration file.  */
++static bool
++handle_file (const char *dir, const char *infile)
+ {
+-  char *cp;
+   FILE *fp;
+   char *line = NULL;
+   size_t linelen = 0;
+-  size_t dirlen = strlen (dir);
+-
+-  if (dir[dirlen - 1] != '/')
+-    {
+-      char *newp = (char *) xmalloc (dirlen + 2);
+-      dir = memcpy (newp, dir, dirlen);
+-      newp[dirlen++] = '/';
+-      newp[dirlen] = '\0';
+-    }
+-
+-  char infile[prefix_len + dirlen + sizeof "gconv-modules"];
+-  cp = infile;
+-  if (dir[0] == '/')
+-    cp = mempcpy (cp, prefix, prefix_len);
+-  strcpy (mempcpy (cp, dir, dirlen), "gconv-modules");
+ 
+   fp = fopen (infile, "r");
+   if (fp == NULL)
+-    {
+-      error (0, errno, "cannot open `%s'", infile);
+-      return 1;
+-    }
++    return false;
+ 
+   /* No threads present.  */
+   __fsetlocking (fp, FSETLOCKING_BYCALLER);
+@@ -723,7 +703,42 @@ handle_dir (const char *dir)
+ 
+   fclose (fp);
+ 
+-  return 0;
++  return true;
++}
++
++/* Read config files and add the data for this directory to cache.  */
++static int
++handle_dir (const char *dir)
++{
++  char *cp;
++  size_t dirlen = strlen (dir);
++  bool found = false;
++
++  if (dir[dirlen - 1] != '/')
++    {
++      char *newp = (char *) xmalloc (dirlen + 2);
++      dir = memcpy (newp, dir, dirlen);
++      newp[dirlen++] = '/';
++      newp[dirlen] = '\0';
++    }
++
++  char infile[prefix_len + dirlen + sizeof "gconv-modules"];
++  cp = infile;
++  if (dir[0] == '/')
++    cp = mempcpy (cp, prefix, prefix_len);
++  strcpy (mempcpy (cp, dir, dirlen), "gconv-modules");
++
++  found |= handle_file (dir, infile);
++
++  if (!found)
++    {
++      error (0, errno, "failed to open gconv configuration file in `%s'",
++	     dir);
++      error (0, 0,
++	     "ensure that the directory contains a valid gconv-modules file.");
++    }
++
++  return found ? 0 : 1;
+ }
+ 
+ 

SOURCES/glibc-rh1971664-10.patch

+commit eeac390eecf7de24a110dc84e77e1190f42c5305
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Thu Jun 10 14:31:57 2021 +0530
+
+    iconvconfig: Use common gconv module parsing function
+    
+    Drop local copy of gconv file parsing and use the one in
+    gconv_parseconfdir.h instead.  Now there is a single implementation of
+    configuration file parsing.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
+index 2f9d5f45ad3a8159..01ecf6f67d55dbbf 100644
+--- a/iconv/iconvconfig.c
++++ b/iconv/iconvconfig.c
+@@ -18,7 +18,6 @@
+ 
+ #include <argp.h>
+ #include <assert.h>
+-#include <dirent.h>
+ #include <error.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -34,10 +33,10 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/cdefs.h>
+-#include <sys/types.h>
+ #include <sys/uio.h>
+ 
+ #include "iconvconfig.h"
++#include <gconv_parseconfdir.h>
+ 
+ /* Get libc version number.  */
+ #include "../version.h"
+@@ -568,7 +567,9 @@ new_module (const char *fromname, size_t fromlen, const char *toname,
+ 
+ /* Add new module.  */
+ static void
+-add_module (char *rp, const char *directory)
++add_module (char *rp, const char *directory,
++	    size_t dirlen __attribute__ ((__unused__)),
++	    int modcount __attribute__ ((__unused__)))
+ {
+   /* We expect now
+      1. `from' name
+@@ -646,131 +647,28 @@ add_module (char *rp, const char *directory)
+ 	      cost, need_ext);
+ }
+ 
+-/* Read a gconv-modules configuration file.  */
+-static bool
+-handle_file (const char *dir, const char *infile)
+-{
+-  FILE *fp;
+-  char *line = NULL;
+-  size_t linelen = 0;
+-
+-  fp = fopen (infile, "r");
+-  if (fp == NULL)
+-    return false;
+-
+-  /* No threads present.  */
+-  __fsetlocking (fp, FSETLOCKING_BYCALLER);
+-
+-  while (!feof_unlocked (fp))
+-    {
+-      char *rp, *endp, *word;
+-      ssize_t n = __getdelim (&line, &linelen, '\n', fp);
+-
+-      if (n < 0)
+-	/* An error occurred.  */
+-	break;
+-
+-      rp = line;
+-      /* Terminate the line (excluding comments or newline) with a NUL
+-	 byte to simplify the following code.  */
+-      endp = strchr (rp, '#');
+-      if (endp != NULL)
+-	*endp = '\0';
+-      else
+-	if (rp[n - 1] == '\n')
+-	  rp[n - 1] = '\0';
+-
+-      while (isspace (*rp))
+-	++rp;
+-
+-      /* If this is an empty line go on with the next one.  */
+-      if (rp == endp)
+-	continue;
+-
+-      word = rp;
+-      while (*rp != '\0' && !isspace (*rp))
+-	++rp;
+-
+-      if (rp - word == sizeof ("alias") - 1
+-	  && memcmp (word, "alias", sizeof ("alias") - 1) == 0)
+-	add_alias (rp);
+-      else if (rp - word == sizeof ("module") - 1
+-	       && memcmp (word, "module", sizeof ("module") - 1) == 0)
+-	add_module (rp, dir);
+-      /* else */
+-	/* Otherwise ignore the line.  */
+-    }
+-
+-  free (line);
+-
+-  fclose (fp);
+-
+-  return true;
+-}
+-
+ /* Read config files and add the data for this directory to cache.  */
+ static int
+ handle_dir (const char *dir)
+ {
+-  char *cp;
+   size_t dirlen = strlen (dir);
+   bool found = false;
+ 
++  /* Add the prefix before sending it off to the parser.  */
++  char *fulldir = xmalloc (prefix_len + dirlen + 2);
++  char *cp = mempcpy (mempcpy (fulldir, prefix, prefix_len), dir, dirlen);
++
+   if (dir[dirlen - 1] != '/')
+     {
+-      char *newp = (char *) xmalloc (dirlen + 2);
+-      dir = memcpy (newp, dir, dirlen);
+-      newp[dirlen++] = '/';
+-      newp[dirlen] = '\0';
++      *cp++ = '/';
++      *cp = '\0';
++      dirlen++;
+     }
+ 
+-  /* First, look for a gconv-modules file.  */
+-  char *buf = malloc (prefix_len + dirlen + sizeof "gconv-modules.d");
+-  if (buf == NULL)
+-    goto out;
+-
+-  cp = buf;
+-  if (dir[0] == '/')
+-    cp = mempcpy (cp, prefix, prefix_len);
+-  cp = mempcpy (cp, dir, dirlen);
+-  cp = stpcpy (cp, "gconv-modules");
+-
+-  found |= handle_file (dir, buf);
+-
+-  /* Next, see if there is a gconv-modules.d directory containing configuration
+-     files and if it is non-empty.  */
+-  cp[0] = '.';
+-  cp[1] = 'd';
+-  cp[2] = '\0';
+-
+-  DIR *confdir = opendir (buf);
+-  if (confdir != NULL)
+-    {
+-      struct dirent *ent;
+-      while ((ent = readdir (confdir)) != NULL)
+-	{
+-	  if (ent->d_type != DT_REG)
+-	    continue;
+-
+-	  size_t len = strlen (ent->d_name);
+-	  const char *suffix = ".conf";
+-
+-	  if (len > strlen (suffix)
+-	      && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
+-	    {
+-	      char *conf;
+-	      if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
+-		continue;
+-	      found |= handle_file (dir, conf);
+-	      free (conf);
+-	    }
+-	}
+-      closedir (confdir);
+-    }
++  found = gconv_parseconfdir (fulldir, dirlen + prefix_len);
+ 
+-  free (buf);
++  free (fulldir);
+ 
+-out:
+   if (!found)
+     {
+       error (0, errno, "failed to open gconv configuration files in `%s'",

SOURCES/glibc-rh1971664-11.patch

+Changes specific to RHEL-8:
+
+- lstat64 is a macro, so undefine it first
+
+commit f3629a4be82a393ff56646c388da2fda0101f557
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Thu Jun 10 14:56:37 2021 +0530
+
+    Handle DT_UNKNOWN in gconv-modules.d
+    
+    On filesystems that do not support dt_type, a regular file shows up as
+    DT_UNKNOWN.  Fall back to using lstat64 to read file properties in
+    such cases.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
+index 3d4d58d4be10a250..ba9b3fd36d9e30f9 100644
+--- a/iconv/gconv_parseconfdir.h
++++ b/iconv/gconv_parseconfdir.h
+@@ -32,6 +32,8 @@
+ # define readdir __readdir
+ # define closedir __closedir
+ # define mempcpy __mempcpy
++# undef lstat64
++# define lstat64 __lstat64
+ #endif
+ 
+ /* Name of the file containing the module information in the directories
+@@ -138,7 +140,7 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
+       struct dirent *ent;
+       while ((ent = readdir (confdir)) != NULL)
+ 	{
+-	  if (ent->d_type != DT_REG)
++	  if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN)
+ 	    continue;
+ 
+ 	  size_t len = strlen (ent->d_name);
+@@ -148,8 +150,14 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
+ 	      && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
+ 	    {
+ 	      char *conf;
++	      struct stat64 st;
+ 	      if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
+ 		continue;
++	      if (ent->d_type == DT_UNKNOWN
++		  && (lstat64 (conf, &st) == -1
++		      || !S_ISREG (st.st_mode)))
++		continue;
++
+ 	      found |= read_conf_file (conf, dir, dir_len);
+ 	      free (conf);
+ 	    }

SOURCES/glibc-rh1971664-12.patch

+commit 9429049c178b3af3d6afeb3717ff1f2214dc9572
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Mon Jun 28 09:15:55 2021 +0530
+
+    iconvconfig: Fix multiple issues
+    
+    It was noticed on big-endian systems that msgfmt would fail with the
+    following error:
+    
+    msgfmt: gconv_builtin.c:70: __gconv_get_builtin_trans: Assertion `cnt < sizeof (map) / sizeof (map[0])' failed.
+    Aborted (core dumped)
+    
+    This is only seen on installed systems because it was due to a
+    corrupted gconv-modules.cache.  iconvconfig had the following issues
+    (it was specifically freeing fulldir that caused this issue, but other
+    cleanups are also needed) that this patch fixes.
+    
+    - Add prefix only if dir starts with '/'
+    - Use asprintf instead of mempcpy so that the directory string is NULL
+      terminated
+    - Make a copy of the directory reference in new_module so that fulldir
+      can be freed within the same scope in handle_dir.
+    
+    Reviewed-by: Florian Weimer <fweimer@redhat.com>
+
+diff --git a/iconv/Makefile b/iconv/Makefile
+index d09b8ac842731780..6df9862e748ae588 100644
+--- a/iconv/Makefile
++++ b/iconv/Makefile
+@@ -33,7 +33,7 @@ vpath %.c ../locale/programs ../intl
+ iconv_prog-modules = iconv_charmap charmap charmap-dir linereader \
+ 		     dummy-repertoire simple-hash xstrdup xmalloc \
+ 		     record-status
+-iconvconfig-modules = strtab xmalloc hash-string
++iconvconfig-modules = strtab xmalloc xasprintf xstrdup hash-string
+ extra-objs	   = $(iconv_prog-modules:=.o) $(iconvconfig-modules:=.o)
+ CFLAGS-iconv_prog.c += -I../locale/programs
+ CFLAGS-iconv_charmap.c += -I../locale/programs
+diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
+index 01ecf6f67d55dbbf..777da870d2f8e99a 100644
+--- a/iconv/iconvconfig.c
++++ b/iconv/iconvconfig.c
+@@ -250,6 +250,7 @@ static const char gconv_module_ext[] = MODULE_EXT;
+ 
+ 
+ #include <programs/xmalloc.h>
++#include <programs/xasprintf.h>
+ 
+ 
+ /* C string table handling.  */
+@@ -519,11 +520,12 @@ module_compare (const void *p1, const void *p2)
+ /* Create new module record.  */
+ static void
+ new_module (const char *fromname, size_t fromlen, const char *toname,
+-	    size_t tolen, const char *directory,
++	    size_t tolen, const char *dir_in,
+ 	    const char *filename, size_t filelen, int cost, size_t need_ext)
+ {
+   struct module *new_module;
+-  size_t dirlen = strlen (directory) + 1;
++  size_t dirlen = strlen (dir_in) + 1;
++  const char *directory = xstrdup (dir_in);
+   char *tmp;
+   void **inserted;
+ 
+@@ -654,20 +656,10 @@ handle_dir (const char *dir)
+   size_t dirlen = strlen (dir);
+   bool found = false;
+ 
+-  /* Add the prefix before sending it off to the parser.  */
+-  char *fulldir = xmalloc (prefix_len + dirlen + 2);
+-  char *cp = mempcpy (mempcpy (fulldir, prefix, prefix_len), dir, dirlen);
++  char *fulldir = xasprintf ("%s%s%s", dir[0] == '/' ? prefix : "",
++			     dir, dir[dirlen - 1] != '/' ? "/" : "");
+ 
+-  if (dir[dirlen - 1] != '/')
+-    {
+-      *cp++ = '/';
+-      *cp = '\0';
+-      dirlen++;
+-    }
+-
+-  found = gconv_parseconfdir (fulldir, dirlen + prefix_len);
+-
+-  free (fulldir);
++  found = gconv_parseconfdir (fulldir, strlen (fulldir));
+ 
+   if (!found)
+     {
+@@ -679,6 +671,8 @@ handle_dir (const char *dir)
+ 	     "configuration files with names ending in .conf.");
+     }
+ 
++  free (fulldir);
++
+   return found ? 0 : 1;
+ }
+ 

SOURCES/glibc-rh1971664-13.patch

+commit 7f784fabcb186ffaa082ed0aeed52a56b7d96cee
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Fri Jul 2 16:53:25 2021 +0530
+
+    iconvconfig: Use the public feof_unlocked
+    
+    Build of iconvconfig failed with CFLAGS=-Os since __feof_unlocked is
+    not a public symbol.  Replace with feof_unlocked (defined to
+    __feof_unlocked when IS_IN (libc)) to fix this.
+    
+    Reported-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
+    Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
+index ba9b3fd36d9e30f9..234b85a586f1d79a 100644
+--- a/iconv/gconv_parseconfdir.h
++++ b/iconv/gconv_parseconfdir.h
+@@ -34,6 +34,7 @@
+ # define mempcpy __mempcpy
+ # undef lstat64
+ # define lstat64 __lstat64
++# define feof_unlocked __feof_unlocked
+ #endif
+ 
+ /* Name of the file containing the module information in the directories
+@@ -65,7 +66,7 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len)
+ 
+   /* Process the known entries of the file.  Comments start with `#' and
+      end with the end of the line.  Empty lines are ignored.  */
+-  while (!__feof_unlocked (fp))
++  while (!feof_unlocked (fp))
+     {
+       char *rp, *endp, *word;
+       ssize_t n = __getdelim (&line, &line_len, '\n', fp);

SOURCES/glibc-rh1971664-14.patch

+commit 5f9b78fe35d08739b6da1e5b356786d41116c108
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Tue Aug 3 21:10:20 2021 +0530
+
+    gconv_parseconfdir: Fix memory leak
+    
+    The allocated `conf` would leak if we have to skip over the file due
+    to the underlying filesystem not supporting dt_type.
+    
+    Reviewed-by: Arjun Shankar <arjun@redhat.com>
+
+diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
+index 915b60845ca11c03..e4c3c16d1f96ce0c 100644
+--- a/iconv/gconv_parseconfdir.h
++++ b/iconv/gconv_parseconfdir.h
+@@ -153,12 +153,11 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
+ 	      struct stat64 st;
+ 	      if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
+ 		continue;
+-	      if (ent->d_type == DT_UNKNOWN
+-		  && (lstat64 (conf, &st) == -1
+-		      || !S_ISREG (st.st_mode)))
+-		continue;
+ 
+-	      found |= read_conf_file (conf, dir, dir_len);
++	      if (ent->d_type != DT_UNKNOWN
++		  || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode)))
++		found |= read_conf_file (conf, dir, dir_len);
++
+ 	      free (conf);
+ 	    }
+ 	}

SOURCES/glibc-rh1971664-15.patch

+commit 43cea6d5652b6b9e61ac6ecc69419c909b504f47
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Mon Sep 13 20:48:35 2021 +0530
+
+    iconvconfig: Fix behaviour with --prefix [BZ #28199]
+    
+    The consolidation of configuration parsing broke behaviour with
+    --prefix, where the prefix bled into the modules cache.  Accept a
+    prefix which, when non-NULL, is prepended to the path when looking for
+    configuration files but only the original directory is added to the
+    modules cache.
+    
+    This has no effect on the codegen of gconv_conf since it passes NULL.
+    
+    Reported-by: Patrick McCarty <patrick.mccarty@intel.com>
+    Reported-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
+    Reviewed-by: Andreas Schwab <schwab@linux-m68k.org>
+
+diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
+index ce64faa928dc1c52..3f5a692f1510157c 100644
+--- a/iconv/gconv_conf.c
++++ b/iconv/gconv_conf.c
+@@ -476,7 +476,7 @@ __gconv_read_conf (void)
+     __gconv_get_path ();
+ 
+   for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt)
+-    gconv_parseconfdir (__gconv_path_elem[cnt].name,
++    gconv_parseconfdir (NULL, __gconv_path_elem[cnt].name,
+ 			__gconv_path_elem[cnt].len);
+ #endif
+ 
+diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
+index e4c3c16d1f96ce0c..433aa18bab5083b0 100644
+--- a/iconv/gconv_parseconfdir.h
++++ b/iconv/gconv_parseconfdir.h
+@@ -39,7 +39,6 @@
+ /* Name of the file containing the module information in the directories
+    along the path.  */
+ static const char gconv_conf_filename[] = "gconv-modules";
+-static const char gconv_conf_dirname[] = "gconv-modules.d";
+ 
+ static void add_alias (char *);
+ static void add_module (char *, const char *, size_t, int);
+@@ -110,19 +109,28 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len)
+   return true;
+ }
+ 
++/* Prefix DIR (with length DIR_LEN) with PREFIX if the latter is non-NULL and
++   parse configuration in it.  */
++
+ static __always_inline bool
+-gconv_parseconfdir (const char *dir, size_t dir_len)
++gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
+ {
+-  /* No slash needs to be inserted between dir and gconv_conf_filename;
+-     dir already ends in a slash.  */
+-  char *buf = malloc (dir_len + sizeof (gconv_conf_dirname));
++  /* No slash needs to be inserted between dir and gconv_conf_filename; dir
++     already ends in a slash.  The additional 2 is to accommodate the ".d"
++     when looking for configuration files in gconv-modules.d.  */
++  size_t buflen = dir_len + sizeof (gconv_conf_filename) + 2;
++  char *buf = malloc (buflen + (prefix != NULL ? strlen (prefix) : 0));
++  char *cp = buf;
+   bool found = false;
+ 
+   if (buf == NULL)
+     return false;
+ 
+-  char *cp = mempcpy (mempcpy (buf, dir, dir_len), gconv_conf_filename,
+-		      sizeof (gconv_conf_filename));
++  if (prefix != NULL)
++    cp = stpcpy (cp, prefix);
++
++  cp = mempcpy (mempcpy (cp, dir, dir_len), gconv_conf_filename,
++		sizeof (gconv_conf_filename));
+ 
+   /* Read the gconv-modules configuration file first.  */
+   found = read_conf_file (buf, dir, dir_len);
+diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
+index 777da870d2f8e99a..b1fd4100b5cbc9d2 100644
+--- a/iconv/iconvconfig.c
++++ b/iconv/iconvconfig.c
+@@ -653,13 +653,21 @@ add_module (char *rp, const char *directory,
+ static int
+ handle_dir (const char *dir)
+ {
++  char *newp = NULL;
+   size_t dirlen = strlen (dir);
+   bool found = false;
+ 
+-  char *fulldir = xasprintf ("%s%s%s", dir[0] == '/' ? prefix : "",
+-			     dir, dir[dirlen - 1] != '/' ? "/" : "");
++  /* End directory path with a '/' if it doesn't already.  */
++  if (dir[dirlen - 1] != '/')
++    {
++      newp = xmalloc (dirlen + 2);
++      memcpy (newp, dir, dirlen);
++      newp[dirlen++] = '/';
++      newp[dirlen] = '\0';
++      dir = newp;
++    }
+ 
+-  found = gconv_parseconfdir (fulldir, strlen (fulldir));
++  found = gconv_parseconfdir (dir[0] == '/' ? prefix : NULL, dir, dirlen);
+ 
+   if (!found)
+     {
+@@ -671,7 +679,7 @@ handle_dir (const char *dir)
+ 	     "configuration files with names ending in .conf.");
+     }
+ 
+-  free (fulldir);
++  free (newp);
+ 
+   return found ? 0 : 1;
+ }

SOURCES/glibc-rh1971664-2.patch

+commit 3979c3e1bae20459d9b6d424bdb49927d9cd6fec
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Mon Jun 7 14:22:18 2021 +0530
+
+    iconvconfig: Read configuration from gconv-modules.d subdirectory
+    
+    In addition to GCONV_PATH/gconv-modules, also read module
+    configuration from *.conf files in GCONV_PATH/gconv-modules.d.  This
+    allows a single gconv directory to have multiple sets of gconv modules
+    but at the same time, a single modules cache.
+    
+    With this feature, one could separate the glibc supported gconv
+    modules into a minimal essential set (ISO-8859-*, UTF, etc.) from the
+    remaining modules.  In future, these could be further segregated into
+    langpack-associated sets with their own
+    gconv-modules.d/someconfig.conf.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
+index 2b3c587bc77cfdcd..fafc686ae25fb5c1 100644
+--- a/iconv/iconvconfig.c
++++ b/iconv/iconvconfig.c
+@@ -18,6 +18,7 @@
+ 
+ #include <argp.h>
+ #include <assert.h>
++#include <dirent.h>
+ #include <error.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -33,6 +34,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/cdefs.h>
++#include <sys/types.h>
+ #include <sys/uio.h>
+ 
+ #include "iconvconfig.h"
+@@ -710,6 +712,7 @@ handle_file (const char *dir, const char *infile)
+ static int
+ handle_dir (const char *dir)
+ {
++#define BUF_LEN prefix_len + dirlen + sizeof "gconv-modules.d"
+   char *cp;
+   size_t dirlen = strlen (dir);
+   bool found = false;
+@@ -722,20 +725,55 @@ handle_dir (const char *dir)
+       newp[dirlen] = '\0';
+     }
+ 
+-  char infile[prefix_len + dirlen + sizeof "gconv-modules"];
+-  cp = infile;
++  /* First, look for a gconv-modules file.  */
++  char buf[BUF_LEN];
++  cp = buf;
+   if (dir[0] == '/')
+     cp = mempcpy (cp, prefix, prefix_len);
+-  strcpy (mempcpy (cp, dir, dirlen), "gconv-modules");
++  cp = mempcpy (cp, dir, dirlen);
++  cp = stpcpy (cp, "gconv-modules");
+ 
+-  found |= handle_file (dir, infile);
++  found |= handle_file (dir, buf);
++
++  /* Next, see if there is a gconv-modules.d directory containing configuration
++     files and if it is non-empty.  */
++  cp[0] = '.';
++  cp[1] = 'd';
++  cp[2] = '\0';
++
++  DIR *confdir = opendir (buf);
++  if (confdir != NULL)
++    {
++      struct dirent *ent;
++      while ((ent = readdir (confdir)) != NULL)
++	{
++	  if (ent->d_type != DT_REG)
++	    continue;
++
++	  size_t len = strlen (ent->d_name);
++	  const char *suffix = ".conf";
++
++	  if (len > strlen (suffix)
++	      && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
++	    {
++	      /* LEN <= PATH_MAX so this alloca is not unbounded.  */
++	      char *conf = alloca (BUF_LEN + len + 1);
++	      cp = stpcpy (conf, buf);
++	      sprintf (cp, "/%s", ent->d_name);
++	      found |= handle_file (dir, conf);
++	    }
++	}
++      closedir (confdir);
++    }
+ 
+   if (!found)
+     {
+-      error (0, errno, "failed to open gconv configuration file in `%s'",
++      error (0, errno, "failed to open gconv configuration files in `%s'",
+ 	     dir);
+       error (0, 0,
+-	     "ensure that the directory contains a valid gconv-modules file.");
++	     "ensure that the directory contains either a valid "
++	     "gconv-modules file or a gconv-modules.d directory with "
++	     "configuration files with names ending in .conf.");
+     }
+ 
+   return found ? 0 : 1;

SOURCES/glibc-rh1971664-3.patch

+commit b17d29b390154df9dfad9d21f1e6605422521fd2
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Mon Jun 7 14:22:19 2021 +0530
+
+    gconv_conf: Read configuration files in gconv-modules.d
+    
+    Read configuration files with names ending in .conf in
+    GCONV_PATH/gconv-modules.d to mirror configuration flexibility in
+    iconvconfig into the iconv program and function.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
+index f173cde71b2a61d7..8eb981fca7cee36a 100644
+--- a/iconv/gconv_conf.c
++++ b/iconv/gconv_conf.c
+@@ -19,6 +19,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
++#include <dirent.h>
+ #include <errno.h>
+ #include <limits.h>
+ #include <locale.h>
+@@ -30,6 +31,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/param.h>
++#include <sys/types.h>
+ 
+ #include <libc-lock.h>
+ #include <gconv_int.h>
+@@ -50,6 +52,7 @@ static const struct path_elem empty_path_elem = { NULL, 0 };
+ /* Name of the file containing the module information in the directories
+    along the path.  */
+ static const char gconv_conf_filename[] = "gconv-modules";
++static const char gconv_conf_dirname[] = "gconv-modules.d";
+ 
+ /* Filename extension for the modules.  */
+ #ifndef MODULE_EXT
+@@ -554,18 +557,52 @@ __gconv_read_conf (void)
+ 
+   for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt)
+     {
++#define BUF_LEN elem_len + sizeof (gconv_conf_dirname)
++
+       const char *elem = __gconv_path_elem[cnt].name;
+       size_t elem_len = __gconv_path_elem[cnt].len;
+-      char *filename;
++      char *buf;
+ 
+       /* No slash needs to be inserted between elem and gconv_conf_filename;
+ 	 elem already ends in a slash.  */
+-      filename = alloca (elem_len + sizeof (gconv_conf_filename));
+-      __mempcpy (__mempcpy (filename, elem, elem_len),
+-		 gconv_conf_filename, sizeof (gconv_conf_filename));
++      buf = alloca (BUF_LEN);
++      char *cp = __mempcpy (__mempcpy (buf, elem, elem_len),
++			    gconv_conf_filename, sizeof (gconv_conf_filename));
++
++      /* Read the gconv-modules configuration file first.  */
++      read_conf_file (buf, elem, elem_len, &modules, &nmodules);
++
++      /* Next, see if there is a gconv-modules.d directory containing
++	 configuration files and if it is non-empty.  */
++      cp--;
++      cp[0] = '.';
++      cp[1] = 'd';
++      cp[2] = '\0';
++
++      DIR *confdir = __opendir (buf);
++      if (confdir != NULL)
++	{
++	  struct dirent *ent;
++	  while ((ent = __readdir (confdir)) != NULL)
++	    {
++	      if (ent->d_type != DT_REG)
++		continue;
++
++	      size_t len = strlen (ent->d_name);
++	      const char *suffix = ".conf";
+ 
+-      /* Read the next configuration file.  */
+-      read_conf_file (filename, elem, elem_len, &modules, &nmodules);
++	      if (len > strlen (suffix)
++		  && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
++		{
++		  /* LEN <= PATH_MAX so this alloca is not unbounded.  */
++		  char *conf = alloca (BUF_LEN + len + 1);
++		  cp = stpcpy (conf, buf);
++		  sprintf (cp, "/%s", ent->d_name);
++		  read_conf_file (conf, elem, elem_len, &modules, &nmodules);
++		}
++	    }
++	  __closedir (confdir);
++	}
+     }
+ #endif
+ 

SOURCES/glibc-rh1971664-4.patch

+commit fc5bfade69ca12d034967dc6b929dbe3dd715172
+Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date:   Mon Jun 7 14:22:20 2021 +0530
+
+    iconvdata: Move gconv-modules configuration to gconv-modules.conf
+    
+    Move all gconv-modules configuration files to gconv-modules.conf.
+    That is, the S390 extensions now become gconv-modules-s390.conf.  Move
+    both configuration files into gconv-modules.d.
+    
+    Now GCONV_PATH/gconv-modules is read only for backward compatibility
+    for third-party gconv modules directories.
+    
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+# Conflicts:
+#	iconvdata/Makefile
+
+diff --git a/iconvdata/Makefile b/iconvdata/Makefile
+index 32656ad31d9b434b..fc403e8abe3cc11f 100644
+--- a/iconvdata/Makefile
++++ b/iconvdata/Makefile
+@@ -136,10 +136,13 @@ charmaps = ../localedata/charmaps
+ extra-modules-left := $(modules)
+ include extra-module.mk
+ 
++gconv-modules = gconv-modules.conf
++modpfx = $(objpfx)gconv-modules.d/
+ 
+ extra-objs	+= $(modules.so)
+ install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
+-		  $(inst_gconvdir)/gconv-modules
++		  $(addprefix $(inst_gconvdir)/gconv-modules.d/, \
++			      $(gconv-modules))
+ 
+ # We can build the conversion tables for numerous charsets automatically.
+ 
+@@ -181,7 +184,7 @@ generated += $(generated-modules:=.h) $(generated-modules:=.stmp) \
+ 	     iconv-test.out iconv-rules tst-loading.mtrace	 \
+ 	     mtrace-tst-loading.out tst-tables.out iconv-test.xxx
+ ifdef objpfx
+-generated += gconv-modules
++generated += $(addprefix gconv-modules.d/,$(gconv-modules))
+ endif
+ 
+ # Rules to generate the headers.
+@@ -249,7 +252,8 @@ headers: $(addprefix $(objpfx), $(generated-modules:=.h))
+ $(addprefix $(inst_gconvdir)/, $(modules.so)): \
+     $(inst_gconvdir)/%: $(objpfx)% $(+force)
+ 	$(do-install-program)
+-$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules $(+force)
++$(addprefix $(inst_gconvdir)/gconv-modules.d/, $(gconv-modules)): \
++    $(inst_gconvdir)/gconv-modules.d/%: $(modpfx)% $(+force)
+ 	$(do-install)
+ ifeq (no,$(cross-compiling))
+ # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
+@@ -297,29 +301,30 @@ $(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out
+ 	$(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \
+ 	$(evaluate-test)
+ 
+-$(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv1.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv2.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so))
+ $(objpfx)bug-iconv3: $(libdl)
+-$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv3.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)bug-iconv5.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv5.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)tst-loading.out: $(objpfx)gconv-modules \
++$(objpfx)tst-loading.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			  $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
++$(objpfx)tst-iconv4.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
++$(objpfx)tst-iconv7.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv10.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			  $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv12.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			  $(addprefix $(objpfx),$(modules.so))
+-$(objpfx)bug-iconv14.out: $(objpfx)gconv-modules \
++$(objpfx)bug-iconv14.out: $(addprefix $(modpfx), $(gconv-modules)) \
+ 			  $(addprefix $(objpfx),$(modules.so))
+ 
+-$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
++$(objpfx)iconv-test.out: run-iconv-test.sh \
++			 $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so)) \
+ 			 $(common-objdir)/iconv/iconv_prog TESTS
+ 	iconv_modules="$(modules)" \
+@@ -327,7 +332,8 @@ $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
+ 		 '$(run-program-env)' > $@; \
+ 	$(evaluate-test)
+ 
+-$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
++$(objpfx)tst-tables.out: tst-tables.sh \
++			 $(addprefix $(modpfx), $(gconv-modules)) \
+ 			 $(addprefix $(objpfx),$(modules.so)) \
+ 			 $(objpfx)tst-table-from $(objpfx)tst-table-to
+ 	$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
+@@ -340,5 +346,8 @@ do-tests-clean common-mostlyclean: tst-tables-clean
+ tst-tables-clean:
+ 	-rm -f $(objpfx)tst-*.table $(objpfx)tst-EUC-TW.irreversible
+ 
+-$(objpfx)gconv-modules: gconv-modules
+-	cat $(sysdeps-gconv-modules) $^ > $@
++$(modpfx):
++	mkdir -p $@
++
++$(modpfx)%: % $(modpfx)
++	cp $< $@
+diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules.conf
+similarity index 100%
+rename from iconvdata/gconv-modules
+rename to iconvdata/gconv-modules.conf
+diff --git a/localedata/Makefile b/localedata/Makefile
+index 14fcc37fed21e740..a5ca7a31f43d50c3 100644
+--- a/localedata/Makefile
++++ b/localedata/Makefile
+@@ -179,7 +179,7 @@ install-others := $(addprefix $(inst_i18ndir)/, \
+ 			      $(locales))
+ endif
+ 
+-tests: $(objdir)/iconvdata/gconv-modules
++tests: $(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf
+ 
+ tests-static += tst-langinfo-newlocale-static tst-langinfo-setlocale-static
+ 
+@@ -442,5 +442,5 @@ $(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out
+ bug-setlocale1-ENV-only = LOCPATH=$(objpfx) LC_CTYPE=de_DE.UTF-8
+ bug-setlocale1-static-ENV-only = $(bug-setlocale1-ENV-only)
+ 
+-$(objdir)/iconvdata/gconv-modules:
++$(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf:
+ 	$(MAKE) -C ../iconvdata subdir=iconvdata $@
+diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
+index 8bc82e523f9049db..5c8e1170b4d799ba 100644
+--- a/sysdeps/s390/Makefile
++++ b/sysdeps/s390/Makefile
+@@ -21,13 +21,25 @@ lib := iconvdata
+ include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
+ 
+ extra-objs      += $(addsuffix .so, $(s390x-iconv-modules))
+-install-others  += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))
++install-others  += $(patsubst %, $(inst_gconvdir)/%.so, \
++				 $(s390x-iconv-modules)) \
++		   $(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf
+ 
+ $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) : \
+ $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
+ 	$(do-install-program)
+ 
+-sysdeps-gconv-modules = ../sysdeps/s390/gconv-modules
++ifdef objpfx
++generated += gconv-modules.d/gconv-modules-s390.conf
++endif
++
++$(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf: \
++		$(modpfx)gconv-modules-s390.conf $(+force)
++	$(do-install)
++
++$(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \
++				  $(modpfx)
++	cp $< $@
+ endif
+ 
+ ifeq ($(subdir),string)
+diff --git a/sysdeps/s390/gconv-modules b/sysdeps/s390/gconv-modules-s390.conf
+similarity index 100%
+rename from sysdeps/s390/gconv-modules
+rename to sysdeps/s390/gconv-modules-s390.conf