From 80230e6916ab77188e0fa5504e0cb31569615605 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 31 Aug 2021 11:34:53 +0200
Subject: [PATCH] Auto-sync with upstream branch master

Upstream commit: 3c8b9879cab6d41787bc5b14c1748f62fd6d0e5f

- x86-64: Use testl to check __x86_string_control
- i686: Don't include multiarch memove in libc.a
- support: Add support_wait_for_thread_exit
- Allow #pragma GCC in headers in conformtest
- nptl: Fix tst-cancel7 and tst-cancelx7 race condition (BZ #14232)
- Use support_open_dev_null_range io/tst-closefrom,
  misc/tst-close_range, and posix/tst-spawn5 (BZ #28260)
- support: Add support_open_dev_null_range
- llio.texi: Wording fixes in description of closefrom()
- Fix error message in memmove test to display correct src pointer
---
 glibc.spec | 18 ++++++++++++++++--
 sources    |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index e343bfd..325ca09 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.34.9000-59-g9926f6e2ee
+%define glibcsrcdir glibc-2.34.9000-68-g3c8b9879ca
 %define glibcversion 2.34.9000
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -151,7 +151,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -2261,6 +2261,20 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Tue Aug 31 2021 Florian Weimer <fweimer@redhat.com> - 2.34.9000-5
+- Auto-sync with upstream branch master,
+  commit 3c8b9879cab6d41787bc5b14c1748f62fd6d0e5f:
+- x86-64: Use testl to check __x86_string_control
+- i686: Don't include multiarch memove in libc.a
+- support: Add support_wait_for_thread_exit
+- Allow #pragma GCC in headers in conformtest
+- nptl: Fix tst-cancel7 and tst-cancelx7 race condition (BZ #14232)
+- Use support_open_dev_null_range io/tst-closefrom,
+  misc/tst-close_range, and posix/tst-spawn5 (BZ #28260)
+- support: Add support_open_dev_null_range
+- llio.texi: Wording fixes in description of closefrom()
+- Fix error message in memmove test to display correct src pointer
+
 * Wed Aug 25 2021 Arjun Shankar <arjun@redhat.com> - 2.34.9000-4
 - Auto-sync with upstream branch master,
   commit 9926f6e2eeb374cf729d4bb3f092dd4b36a8f861:
diff --git a/sources b/sources
index f7fc76f..acd9ada 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.34.9000-59-g9926f6e2ee.tar.xz) = 3ee2f45be1630d3e7db2662bdc6fc93cbe3309506decfbad99d2a9d02fb5784d48c74485042ce50ced667a6f9c093d789f08ad30a87a6fae64d2b82c555bbc62
+SHA512 (glibc-2.34.9000-68-g3c8b9879ca.tar.xz) = 861de88b5426cf3c9c6d32cff64ae60f34a3d9569f7f83063cb72d151b918a2ca48167c6448d42de40204601470390725dccc6697e49b509d91a25bcce005ded