From 8479d6740a4c2f202d58bd56e3db7a1eeea46404 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 5 Jul 2021 06:00:05 +0200
Subject: [PATCH] Auto-sync with upstream branch master

Upstream commit: 91fb0f17a5779da6e7877eb74119a83dbe8bf167

- hooks.c: Remove incorrect comment
- mtrace: Add attribute nocommon to mallwatch
- Move glibc.malloc.check implementation into its own file
- mtrace: Deprecate mallwatch and tr_break
- Drop source dependencies on hooks.c and arena.c
- malloc: Initiate tcache shutdown even without allocations [BZ #28028]
- Add mcheck tests to malloc
- iconvconfig: Use the public feof_unlocked
- resolv: Move libanl into libc (if libpthread is in libc)
- powerpc: optimize strcpy/stpcpy for POWER9/10
- soft-fp: Add __extendhfxf2 and __truncxfhf2
- x86: Check RTM_ALWAYS_ABORT for RTM [BZ #28033]
- Update syscall lists for Linux 5.13
- s390: Fix MEMCHR_Z900_G5 ifunc-variant if n>=0x80000000 [BZ #28024]
- Fix extra PLT reference in libc.so due to __glob64_time64 if build with gcc 7.5 on 32bit.
- AArch64: Add hp-timing.h
- AArch64: Improve strnlen performance
---
 glibc.spec | 28 +++++++++++++++++++++++++---
 sources    |  2 +-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index a894b21..dac3102 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.33.9000-836-geb68d7d23c
+%define glibcsrcdir glibc-2.33.9000-853-g91fb0f17a5
 %define glibcversion 2.33.9000
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -111,7 +111,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 36%{?dist}
+Release: 37%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -1649,7 +1649,7 @@ done
 ###############################################################################
 
 # Static libraries that land in glibc-devel, not glibc-static.
-devel_static_library_pattern='/lib\(\(c\|nldbl\|mvec\)_nonshared\|g\|ieee\|mcheck\|pthread\|dl\|rt\|util\)\.a$'
+devel_static_library_pattern='/lib\(\(c\|nldbl\|mvec\)_nonshared\|g\|ieee\|mcheck\|pthread\|dl\|rt\|util\|anl\)\.a$'
 # Static libraries neither in glibc-devel nor in glibc-static.
 other_static_library_pattern='/libpthread_nonshared\.a'
 
@@ -2207,6 +2207,28 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Mon Jul 05 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-37
+- Move libanl.a into glibc-devel.
+- Auto-sync with upstream branch master,
+  commit 91fb0f17a5779da6e7877eb74119a83dbe8bf167:
+- hooks.c: Remove incorrect comment
+- mtrace: Add attribute nocommon to mallwatch
+- Move glibc.malloc.check implementation into its own file
+- mtrace: Deprecate mallwatch and tr_break
+- Drop source dependencies on hooks.c and arena.c
+- malloc: Initiate tcache shutdown even without allocations [BZ #28028]
+- Add mcheck tests to malloc
+- iconvconfig: Use the public feof_unlocked
+- resolv: Move libanl into libc (if libpthread is in libc)
+- powerpc: optimize strcpy/stpcpy for POWER9/10
+- soft-fp: Add __extendhfxf2 and __truncxfhf2
+- x86: Check RTM_ALWAYS_ABORT for RTM [BZ #28033]
+- Update syscall lists for Linux 5.13
+- s390: Fix MEMCHR_Z900_G5 ifunc-variant if n>=0x80000000 [BZ #28024]
+- Fix extra PLT reference in libc.so due to __glob64_time64 if build with gcc 7.5 on 32bit.
+- AArch64: Add hp-timing.h
+- AArch64: Improve strnlen performance
+
 * Wed Jun 30 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-36
 - Auto-sync with upstream branch master,
   commit eb68d7d23cc411acdf68a60f194343a6774d6194:
diff --git a/sources b/sources
index ebd258d..13fc8e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.33.9000-836-geb68d7d23c.tar.xz) = 59f066611bb2c9f590ea9f4ff79d85f97cbf03d6e5900dca93da8a1baec6aa53f5d607d8efbc37720933b82992ff944ac96e1ab600ea21d435e88e8915068cfb
+SHA512 (glibc-2.33.9000-853-g91fb0f17a5.tar.xz) = 79e74de301ed01e4753ce138de1dfc48a5fbfc6fab95844212427ba070ba836a48d715f2d1a6b127db4a0fcf06d18cf3f5fde0c8c1c5c02606b2a90a70f7f90a