commit 9d02fa728bc9be7aba3ab2a974141f1a574f73cf (HEAD -> gentoo/2.33, gentoo/gentoo/2.33)
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Thu Apr 1 20:14:50 2021 +0000

    Update Nios II libm-test-ulps.
    
    This has a subset of the changes in the version applied to master
    (only those that actually appear in a regeneration on 2.33 branch).
    
    (cherry picked from commit e78ea9bd26199497b9f047e421f16284297629cf)

 sysdeps/nios2/libm-test-ulps | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit ca20537639f53e27b63254ab16f259fd6592b7e1
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Thu Feb 25 14:49:58 2021 +0000

    malloc: Fix a realloc crash with heap tagging [BZ 27468]
    
    _int_free must be called with a chunk that has its tag reset. This was
    missing in a rare case that could crash when heap tagging is enabled:
    when in a multi-threaded process the current arena runs out of memory
    during realloc, but another arena still has space to finish the realloc
    then _int_free was called without clearing the user allocation tags.
    
    Fixes bug 27468.
    
    Reviewed-by: DJ Delorie <dj@redhat.com>
    (cherry picked from commit 42cc96066b22ba065db11096c78881a55e45def4)
    (cherry picked from commit 98bb18f52a7c576e6068f4b42dea5b24fa6fd81e)

 malloc/malloc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 0311304a691c2deed1b85cc0d25e5e70f78656a4
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Tue Mar 23 17:29:26 2021 +0100

    S390: Also check vector support in memmove ifunc-selector [BZ #27511]
    
    The arch13 memmove variant is currently selected by the ifunc selector
    if the Miscellaneous-Instruction-Extensions Facility 3 facility bit
    is present, but the function is also using vector instructions.
    If the vector support is not present, one is receiving an operation
    exception.
    
    Therefore this patch also checks for vector support in the ifunc
    selector and in ifunc-impl-list.c.
    
    Just to be sure, the configure check is now also testing an arch13
    vector instruction and an arch13 Miscellaneous-Instruction-Extensions
    Facility 3 instruction.
    
    (cherry picked from commit 7759be2593b689cb1eafc0f52ee7f59c639e5d2f)
    (cherry picked from commit fc4ecce85b5ce10f64ae1328f4105ace8d7b7b67)

 sysdeps/s390/configure                   | 8 ++++++--
 sysdeps/s390/configure.ac                | 8 ++++++--
 sysdeps/s390/memmove.c                   | 2 +-
 sysdeps/s390/multiarch/ifunc-impl-list.c | 3 ++-
 4 files changed, 15 insertions(+), 6 deletions(-)

commit 20baa02f396b82fa772a677d820960679f6fc1de
Author: DJ Delorie <dj@redhat.com>
Date:   Thu Mar 11 12:50:02 2021 -0500

    test-container: Always copy test-specific support files [BZ #27537]
    
    There's a small chance that a fresh checkout will result in some of
    the test-specific container files will have the same timestamp and
    size, which breaks the rsync logic in test-container, resulting in
    tests running with the wrong support files.
    
    This patch changes the rsync logic to always copy the test-specific
    files, which normally would always be copied anyway.  The rsync logic
    for the testroot itself is unchanged.
    
    (cherry picked from commit 20bee7134801cc932ff87fac511289b92fc94944)
    (cherry picked from commit db32fc27e7bdfb5468200a94e9152bcc1c971d25)

 NEWS                     |  1 +
 support/test-container.c | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

commit d0ec06d650890f63c6177e482091447d115d234c
Author: Florian Weimer <fweimer@redhat.com>
Date:   Thu Feb 4 15:00:20 2021 +0100

    nptl: Remove private futex optimization [BZ #27304]
    
    It is effectively used, unexcept for pthread_cond_destroy, where we do
    not want it; see bug 27304.  The internal locks do not support a
    process-shared mode.
    
    This fixes commit dc6cfdc934db9997c33728082d63552b9eee4563 ("nptl:
    Move pthread_cond_destroy implementation into libc").
    
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
    (cherry picked from commit c4ad832276f4dadfa40904109b26a521468f66bc)
    (cherry picked from commit 79c6be6a0ad59e28cfb73ad6cae6b073e22836e3)

 NEWS                              |  1 +
 sysdeps/nptl/lowlevellock-futex.h | 14 +-------------
 2 files changed, 2 insertions(+), 13 deletions(-)

commit 21940cfd2e8fcd98b6cfb9b5ee914b83a69be524
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Thu Mar 4 15:15:33 2021 +0100

    pthread_once hangs when init routine throws an exception [BZ #18435]
    
    This is another attempt at making pthread_once handle throwing exceptions
    from the init routine callback.  As the new testcases show, just switching
    to the cleanup attribute based cleanup does fix the tst-once5 test, but
    breaks the new tst-oncey3 test.  That is because when throwing exceptions,
    only the unwind info registered cleanups (i.e. C++ destructors or cleanup
    attribute), when cancelling threads and there has been unwind info from the
    cancellation point up to whatever needs cleanup both unwind info registered
    cleanups and THREAD_SETMEM (self, cleanup, ...) registered cleanups are
    invoked, but once we hit some frame with no unwind info, only the
    THREAD_SETMEM (self, cleanup, ...) registered cleanups are invoked.
    So, to stay fully backwards compatible (allow init routines without
    unwind info which encounter cancellation points) and handle exception throwing
    we actually need to register the pthread_once cleanups in both unwind info
    and in the THREAD_SETMEM (self, cleanup, ...) way.
    If an exception is thrown, only the former will happen and we in that case
    need to also unregister the THREAD_SETMEM (self, cleanup, ...) registered
    handler, because otherwise after catching the exception the user code could
    call deeper into the stack some cancellation point, get cancelled and then
    a stale cleanup handler would clobber stack and probably crash.
    If a thread calling init routine is cancelled and unwind info ends before
    the pthread_once frame, it will be cleaned up through self->cleanup as
    before.  And if unwind info is present, unwind_stop first calls the
    self->cleanup registered handler for the frame, then it will call the
    unwind info registered handler but that will already see __do_it == 0
    and do nothing.
    
    (cherry picked from commit f0419e6a10740a672b28e112c409ae24f5e890ab)
    (cherry picked from commit f90d6b0484032334a3e2db5891981e123051cf19)

 NEWS                         |  1 +
 nptl/Makefile                |  4 ---
 nptl/pthreadP.h              | 61 ++++++++++++++++++++++++++++++++++++++++++++
 nptl/pthread_once.c          |  4 +--
 nptl/tst-once5.cc            |  4 +--
 sysdeps/pthread/Makefile     |  4 ++-
 sysdeps/pthread/tst-oncey3.c |  1 +
 sysdeps/pthread/tst-oncey4.c |  1 +
 8 files changed, 70 insertions(+), 10 deletions(-)

commit 29814ceca07b6daea079bf00c4a8c91b154e7cc9
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Mar 15 10:33:43 2021 +0100

    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)").
    
    (cherry picked from commit 4e6db99c665d3b82a70a3e218860ef087b1555b4)
    (cherry picked from commit dd8023c2ac0af28a6e391a2eb5038bb351694243)

 NEWS          |  1 +
 elf/Makefile  | 18 ++++++++++++++++--
 elf/dl-load.c |  8 +++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

commit 80bfc4cc279426478af863721986a9ef6726b1c0
Author: Carlos O'Donell <carlos@redhat.com>
Date:   Fri Mar 12 16:44:47 2021 +0100

    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>
    (cherry picked from commit 332421312576bd7095e70589154af99b124dd2d1)
    (cherry picked from commit ea5a537e879bb667e03435a2308d915dc89448a6)

 NEWS                 |  4 ++++
 elf/Makefile         |  5 ++++-
 elf/dl-load.c        | 63 ++++++++++++++++++++++++----------------------------
 elf/tst-dst-static.c | 32 ++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 35 deletions(-)

commit 470d458c902b7c7ce70f1cbc0ea6b3e9f1a9bc58
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sat Mar 6 10:19:32 2021 -0800

    x86: Handle _SC_LEVEL1_ICACHE_LINESIZE [BZ #27444]
    
    commit 2d651eb9265d1366d7b9e881bfddd46db9c1ecc4
    Author: H.J. Lu <hjl.tools@gmail.com>
    Date:   Fri Sep 18 07:55:14 2020 -0700
    
        x86: Move x86 processor cache info to cpu_features
    
    missed _SC_LEVEL1_ICACHE_LINESIZE.
    
    1. Add level1_icache_linesize to struct cpu_features.
    2. Initialize level1_icache_linesize by calling handle_intel,
    handle_zhaoxin and handle_amd with _SC_LEVEL1_ICACHE_LINESIZE.
    3. Return level1_icache_linesize for _SC_LEVEL1_ICACHE_LINESIZE.
    
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
    (cherry picked from commit f53ffc9b90cbd92fa5518686daf4091bdd1d4889)
    (cherry picked from commit 64f6c287ad3ccd807b7d4c694f4a91e2a662fed5)

 sysdeps/x86/Makefile                            |  8 ++++
 sysdeps/x86/cacheinfo.c                         |  3 ++
 sysdeps/x86/dl-cacheinfo.h                      |  6 +++
 sysdeps/x86/dl-diagnostics-cpu.c                |  2 +
 sysdeps/x86/include/cpu-features.h              |  2 +
 sysdeps/x86/tst-sysconf-cache-linesize-static.c |  1 +
 sysdeps/x86/tst-sysconf-cache-linesize.c        | 57 +++++++++++++++++++++++++
 7 files changed, 79 insertions(+)

commit dcdf97da50d6ec1f521d8375f4f7b44700fdc1a2
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Thu Mar 11 08:21:06 2021 -0300

    io: Return EBAFD for negative file descriptor on fstat (BZ #27559)
    
    Now that fstat is implemented on top fstatat we need to handle negative
    inputs.  The implementation now rejects AT_FDCWD, which would otherwise
    be accepted by the kernel.
    
    Checked on x86_64-linux-gnu and on i686-linux-gnu.
    
    (cherry picked from commit 94caafa040e4b4289c968cd70d53041b1463ac4d)
    (cherry picked from commit 32b9280f1d9f78e8fa3874e22f4d9a76460ee02a)

 io/Makefile                       |   2 +-
 io/fstat.c                        |   6 +++
 io/fstat64.c                      |   6 +++
 io/tst-stat-lfs.c                 |   2 +
 io/tst-stat.c                     | 102 ++++++++++++++++++++++++++++++++++++++
 sysdeps/unix/sysv/linux/fstat.c   |   6 +++
 sysdeps/unix/sysv/linux/fstat64.c |  12 +++++
 7 files changed, 135 insertions(+), 1 deletion(-)

commit 2fcdcb75ec72ae52f393bcea805258dce5097b83
Author: DJ Delorie <dj@redhat.com>
Date:   Thu Feb 25 16:08:21 2021 -0500

    nscd: Fix double free in netgroupcache [BZ #27462]
    
    In commit 745664bd798ec8fd50438605948eea594179fba1 a use-after-free
    was fixed, but this led to an occasional double-free.  This patch
    tracks the "live" allocation better.
    
    Tested manually by a third party.
    
    Related: RHBZ 1927877
    
    Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
    (cherry picked from commit dca565886b5e8bd7966e15f0ca42ee5cff686673)
    (cherry picked from commit a151f2e05a64727c552a297d129b8ef242ffb3b6)

 nscd/netgroupcache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2c759803c994bddb8cacea553d387f83450bfe89
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Feb 2 13:45:58 2021 -0800

    x86: Set minimum x86-64 level marker [BZ #27318]
    
    Since the full ISA set used in an ELF binary is unknown to compiler,
    an x86-64 ISA level marker indicates the minimum, not maximum, ISA set
    required to run such an ELF binary.  We never guarantee a library with
    an x86-64 ISA level v3 marker doesn't contain other ISAs beyond x86-64
    ISA level v3, like AVX VNNI.  We check the x86-64 ISA level marker for
    the minimum ISA set.  Since -march=sandybridge enables only some ISAs
    in x86-64 ISA level v3, we should set the needed ISA marker to v2.
    Otherwise, libc is compiled with -march=sandybridge will fail to run on
    Sandy Bridge:
    
    $ ./elf/ld.so ./libc.so
    ./libc.so: (p) CPU ISA level is lower than required: needed: 7; got: 3
    
    Set the minimum, instead of maximum, x86-64 ISA level marker should have
    no impact on the glibc-hwcaps directory assignment logic in ldconfig nor
    ld.so.
    
    (cherry picked from commit 339bf918ea4830fb35614632e96f3aab3237adce)
    (cherry picked from commit ee9f98d9cac12e843ca59c6e4d4b225f58a66727)

 config.h.in              |  6 ++++++
 sysdeps/x86/configure    | 28 ++++++++++++++++++++++++++++
 sysdeps/x86/configure.ac | 16 ++++++++++++++++
 sysdeps/x86/isa-level.c  | 25 ++++++++++++++-----------
 4 files changed, 64 insertions(+), 11 deletions(-)

commit b0ef21cd8f4573cb39ffc7b97e0b66c5a00df60e
Author: DJ Delorie <dj@redhat.com>
Date:   Thu Feb 18 15:26:30 2021 -0500

    nss: Re-enable NSS module loading after chroot [BZ #27389]
    
    The glibc 2.33 release enabled /etc/nsswitch.conf reloading,
    and to prevent potential security issues like CVE-2019-14271
    the re-loading of nsswitch.conf and all mdoules was disabled
    when the root filesystem changes (see bug 27077).
    
    Unfortunately php-lpfm and openldap both require the ability
    to continue to load NSS modules after chroot. The packages
    do not exec after the chroot, and so do not cause the
    protections to be reset. The only solution is to re-enable
    only NSS module loading (not nsswitch.conf reloading) and so
    get back the previous glibc behaviour.
    
    In the future we may introduce a way to harden applications
    so they do not reload NSS modules once the root filesystem
    changes, or that only files/dns are available pre-loaded
    (or builtin).
    
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
    (cherry picked from commit 58673149f37389495c098421085ffdb468b3f7ad)
    (cherry picked from commit 3e880d733753183696d1a81c34caef3a9add2b0c)

 nss/nss_database.c                            |  1 -
 nss/tst-reload2.c                             | 35 +++++++++++++++++++++------
 nss/tst-reload2.root/etc/hosts                |  1 +
 nss/tst-reload2.root/etc/nsswitch.conf        |  1 +
 nss/tst-reload2.root/subdir/etc/hosts         |  1 +
 nss/tst-reload2.root/subdir/etc/nsswitch.conf |  1 +
 6 files changed, 32 insertions(+), 8 deletions(-)

commit 6481df85597de1d3dc87de7ef5b2f61f892422aa
Author: Florian Weimer <fweimer@redhat.com>
Date:   Wed Feb 24 13:12:04 2021 +0100

    x86: Add CPU-specific diagnostics to ld.so --list-diagnostics
    
    (cherry picked from commit 01a5746b6c8a44dc29d33e056b63485075a6a3cc)
    
    Adjusted to not print the rep_movsb_stop_threshold field, which
    does not exist in glibc 2.33.
    
    (cherry picked from commit 71b2463f6178a6097532dcfe8948bffbe2376dfb)

 sysdeps/x86/dl-diagnostics-cpu.c   | 116 +++++++++++++++++++++++++++++++++++++
 sysdeps/x86/include/cpu-features.h |   2 +
 2 files changed, 118 insertions(+)

commit 240296e629dcdb55927c2872445ba8de22aae607
Author: Florian Weimer <fweimer@redhat.com>
Date:   Tue Mar 2 14:58:05 2021 +0100

    x86: Automate generation of PREFERRED_FEATURE_INDEX_1 bitfield
    
    Use a .def file to define the bitfield layout, so that it is possible
    to iterate over field members using the preprocessor.
    
    (cherry picked from commit e4933c8a92ea08eecdf3ab45e7f76c95dc3d20ac)
    (cherry picked from commit a1eb3915e781c5b9aed89931cbd536a186c15ed5)

 .../cpu-features-preferred_feature_index_1.def     | 34 +++++++++++++++
 sysdeps/x86/include/cpu-features.h                 | 51 ++++++++--------------
 2 files changed, 51 insertions(+), 34 deletions(-)

commit 64d0cea664435ac5a477d21b78738f2aa464f130
Author: Florian Weimer <fweimer@redhat.com>
Date:   Tue Mar 2 15:46:42 2021 +0100

    ld.so: Implement the --list-diagnostics option
    
    (cherry picked from commit 851f32cf7bf7067f73b991610778915edd57d7b4)
    (cherry picked from commit 33dc1dd602aecadf2fc5f322715e6f453dda40b5)

 NEWS                                            |   9 +
 elf/Makefile                                    |   5 +-
 elf/dl-diagnostics-cpu.c                        |  24 +++
 elf/dl-diagnostics-kernel.c                     |  24 +++
 elf/dl-diagnostics.c                            | 265 ++++++++++++++++++++++++
 elf/dl-diagnostics.h                            |  46 ++++
 elf/dl-main.h                                   |   5 +-
 elf/dl-usage.c                                  |   1 +
 elf/rtld.c                                      |  18 +-
 sysdeps/unix/sysv/linux/dl-diagnostics-kernel.c |  77 +++++++
 10 files changed, 466 insertions(+), 8 deletions(-)

commit 5510d44bea20bbf9941c4a56a6e67a22b237ebcd (tag: gentoo/glibc-2.33-2)
Author: Andreas K. Hüttel <dilfridge@gentoo.org>
Date:   Sat Feb 27 18:37:33 2021 +0100

    Enable nss-systemd in nsswitch.conf
    
    See
    https://bugs.gentoo.org/768366
    https://www.freedesktop.org/software/systemd/man/nss-systemd.html
    
    Bug: https://bugs.gentoo.org/768366
    Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

 nss/nsswitch.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b97721d9de6f243a6fe995201fb0ac721585d3d5
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Feb 19 13:29:00 2021 +0100

    string: Work around GCC PR 98512 in rawmemchr
    
    (cherry picked from commit 044e603b698093cf48f6e6229e0b66acf05227e4)
    (cherry picked from commit 8d4241b8976273513e72cc1c5f6b1af3e11f0792)

 string/rawmemchr.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

commit 6cf11b09307dc89b99b4e67eaf985564cc196a71
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Tue Feb 16 16:18:56 2021 +0100

    S390: Add new hwcap values.
    
    The new hwcap values indicate support for arch14 architecture.
    
    (cherry picked from commit 25251c0707fe34f30a27381a5fabc35435a96621)
    (cherry picked from commit 6efa2d44c8a5aeb34bd1f26b707c1713aac5bdd4)

 sysdeps/s390/dl-procinfo.c                | 5 +++--
 sysdeps/s390/dl-procinfo.h                | 4 +++-
 sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

commit 22d1756397ed6452d2b3ee1f3d84de57bcb15e43
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date:   Fri Feb 5 14:09:24 2021 +0530

    tunables: Disallow negative values for some tunables
    
    The glibc.malloc.mmap_max tunable as well as al of the INT_32 tunables
    don't have use for negative values, so pin the hardcoded limits in the
    non-negative range of INT.  There's no real benefit in any of those
    use cases for the extended range of unsigned, so I have avoided added
    a new type to keep things simple.
    
    (cherry picked from commit 228f30ab4724d4087d5f52018873fde22efea6e2)
    (cherry picked from commit c5e354589729c0ca63899923f18783fa6803462d)

 elf/dl-tunables.list           | 6 ++++++
 elf/tst-rtld-list-tunables.exp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit 8342a6458fd06d8fe19b2d93b7d25690ca112ecb
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date:   Wed Feb 3 20:03:19 2021 +0530

    x86: Use SIZE_MAX instead of (long int)-1 for tunable range value
    
    The tunable types are SIZE_T, so set the ranges to the correct maximum
    value, i.e. SIZE_MAX.
    
    (cherry picked from commit a1b8b06a55c1ee581d5ef860cec214b0c27a66f0)
    (cherry picked from commit 905fdc7071638612027739d74d63fc91debb0325)

 sysdeps/x86/dl-cacheinfo.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 9c3229393d6dfdf4df186a5a28fcceb69751355f
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date:   Fri Feb 5 13:18:58 2021 +0530

    tunables: Simplify TUNABLE_SET interface
    
    The TUNABLE_SET interface took a primitive C type argument, which
    resulted in inconsistent type conversions internally due to incorrect
    dereferencing of types, especialy on 32-bit architectures.  This
    change simplifies the TUNABLE setting logic along with the interfaces.
    
    Now all numeric tunable values are stored as signed numbers in
    tunable_num_t, which is intmax_t.  All calls to set tunables cast the
    input value to its primitive type and then to tunable_num_t for
    storage.  This relies on gcc-specific (although I suspect other
    compilers woul also do the same) unsigned to signed integer conversion
    semantics, i.e. the bit pattern is conserved.  The reverse conversion
    is guaranteed by the standard.
    
    (cherry picked from commit 61117bfa1b08ca048e6512c0652c568300fedf6a)
    (cherry picked from commit 15afd6b8d8263010ed41bca09e62fefec1b7b3f8)

 elf/dl-tunable-types.h                         |   4 +-
 elf/dl-tunables.c                              | 128 ++++++++-----------------
 elf/dl-tunables.h                              |  37 +++----
 manual/README.tunables                         |  16 ++--
 sysdeps/unix/sysv/linux/aarch64/cpu-features.c |   2 +-
 sysdeps/x86/dl-cacheinfo.h                     |  15 ++-
 6 files changed, 75 insertions(+), 127 deletions(-)

commit c47cd4d87549b9bb126fb0ca14bcd49b0d48a9b2
Author: Sergei Trofimovich <slyfox@gentoo.org>
Date:   Fri Feb 5 07:32:18 2021 +0000

    nsswitch: return result when nss database is locked [BZ #27343]
    
    Before the change nss_database_check_reload_and_get() did not populate
    the '*result' value when it returned success in a case of chroot
    detection. This caused initgroups() to use garage pointer in the
    following test (extracted from unbound):
    
    ```
    
    int main() {
        // load some NSS modules
        struct passwd * pw = getpwnam("root");
    
        chdir("/tmp");
        chroot("/tmp");
        chdir("/");
        // access nsswitch.conf in a chroot
        initgroups("root", 0);
    }
    ```
    
    Reviewed-by: DJ Delorie <dj@redhat.com>
    (cherry picked from commit c3479fb7939898ec22c655c383454d6e8b982a67)

 nss/nss_database.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 015cb1dd0ed6630f1789c34afe69d7b219ebe861 (tag: gentoo/glibc-2.33-1)
Author: Sergei Trofimovich <slyfox@gentoo.org>
Date:   Sat Jul 11 20:06:51 2020 +0300

    Fix miscompilation on ia64's gcc-10
    
    Bug: https://bugs.gentoo.org/723268
    Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

 sysdeps/unix/sysv/linux/ia64/dl-sysdep.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit c498b9de0d754c8c2b453963195596d1784ead63
Author: Andreas K. Hüttel <dilfridge@gentoo.org>
Date:   Fri Dec 14 20:43:04 2018 +0100

    Force -O0 in conform tests to survive $CC changes
    
    In bug #659030 Gentoo started passing user's CFLAGS via $CC variable.
    conform tests should but are not ready to handle -O1/-O2 yet.
    Tests fail to validate headers due to inlining of weak symbol aliases
    and other problems. Let's force it back to -O0 until it's fixed upstream.
    
    Original patch by Sergei, ported to the new python test framework by Andreas
    
    Bug: https://bugs.gentoo.org/659030
    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

 conform/conformtest.py   | 6 ++++--
 conform/linknamespace.py | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

commit c50e825805e160dbb244156241c7188e973730c6
Author: Mike FABIAN <mfabian@redhat.com>
Date:   Mon Aug 10 15:58:12 2015 +0200

    Add C.UTF-8 locale
    
    Source:
    https://src.fedoraproject.org/rpms/glibc/raw/master/f/glibc-c-utf8-locale.patch
    
    Notes from there:
    This patch needs to upstream as part of Carlos O'Donell
    <carlos@redhat.com>'s work on enabling upstream C.UTF-8 support. This
    work is currently blocked on cleaning up the test results to prove that
    full code-point sorting is working as intended.
    Note that this patch does not provide full code-point sorting as
    expected.
    This patch needs to upstream as soon as possible since it would be nice
    to have this in F29 and fixed.
    
    Further information:
    https://bugzilla.redhat.com/show_bug.cgi?id=902094
    https://sourceware.org/bugzilla/show_bug.cgi?id=17318
    https://bugs.gentoo.org/671024

 localedata/SUPPORTED |   1 +
 localedata/locales/C | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

commit bae37f242d23ac2135a37d4ac8346cb3230b630a
Author: Andreas K. Hüttel <dilfridge@gentoo.org>
Date:   Mon Oct 22 22:34:13 2018 +0200

    Adapt to Gentoo-specific /etc/mail/aliases
    
    Patch by pacho2
    
    Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
    (cherry picked from commit 4e616cda056f471b799beba2b1cedc787ad4ecc0)

 nss/nss_files/files-alias.c    |  2 +-
 nss/tst-nss-files-alias-leak.c | 18 +++++++++---------
 support/support_chroot.c       |  8 +++++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

commit b5c305250e3f6ef97e4847544a5227dc1de2d674
Author: Andreas K. Hüttel <dilfridge@gentoo.org>
Date:   Tue Aug 29 22:58:50 2017 +0200

    Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): Only use gethostbyname4_r"
    
    This reverts commit 8479f23aa1d5e5477a37f46823856bdafaedfa46.
    
    See for the background
      https://sourceware.org/bugzilla/show_bug.cgi?id=16826
      https://bugs.gentoo.org/show_bug.cgi?id=600632
    
    This makes tst-nss-files-hosts-multi fail. Disable it.

 nss/Makefile                | 1 -
 sysdeps/posix/getaddrinfo.c | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

commit e33f15e2a4e1b5ae74b07836102e59c07175b2ae
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed Apr 1 02:15:48 2009 -0400

    Disable ldconfig during install
    
    Do not bother running ldconfig on DESTDIR.  It's a waste of time as we
    won't use the result (portage will rebuild the cache after install).
    Also, the Gentoo sandbox does not currently catch chroot() behavior so
    we end up (incorrectly) flagging it as a violation as a write to /etc.
    
    http://sourceware.org/ml/libc-alpha/2012-08/msg00118.html
    https://bugs.gentoo.org/431038

 Makefile | 1 +
 1 file changed, 1 insertion(+)
