From 667333c331f947cd404dbfa63666fd2ce3fe4b19 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 6 Jul 2017 14:29:12 +0200
Subject: [PATCH] Auto-sync with upstream master

Upstream commit: 031e519c95c069abe4e4c7c59e2b4b67efccdee5

- x86-64: Align the stack in __tls_get_addr (#1440287)
- Add Tok-Pisin (tpi_PG) locale.
- Add missing yesstr/nostr for Pashto locale (swbz#21711)
- Add missing yesstr/nostr for Breton locale (swbz#21706)
- Single threaded stdio optimization
- sysconf: Use conservative default for _SC_NPROCESSORS_ONLN (swbz#21542)
---
 SUPPORTED  |  1 +
 glibc.spec | 14 ++++++++++++--
 sources    |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED b/SUPPORTED
index ba9cdba..29519f9 100644
--- a/SUPPORTED
+++ b/SUPPORTED
@@ -429,6 +429,7 @@ tk_TM/UTF-8 \
 tl_PH.UTF-8/UTF-8 \
 tl_PH/ISO-8859-1 \
 tn_ZA/UTF-8 \
+tpi_PG/UTF-8 \
 tr_CY.UTF-8/UTF-8 \
 tr_CY/ISO-8859-9 \
 tr_TR.UTF-8/UTF-8 \
diff --git a/glibc.spec b/glibc.spec
index 20b389c..5e8486a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-671-g4446a88
+%define glibcsrcdir  glibc-2.25-685-g031e519
 %define glibcversion 2.25.90
-%define glibcrelease 19%{?dist}
+%define glibcrelease 20%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2264,6 +2264,16 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jul 06 2017 Florian Weimer <fweimer@redhat.com> - 2.25.90-20
+- Auto-sync with upstream master,
+  commit 031e519c95c069abe4e4c7c59e2b4b67efccdee5:
+- x86-64: Align the stack in __tls_get_addr (#1440287)
+- Add Tok-Pisin (tpi_PG) locale.
+- Add missing yesstr/nostr for Pashto locale (swbz#21711)
+- Add missing yesstr/nostr for Breton locale (swbz#21706)
+- Single threaded stdio optimization
+- sysconf: Use conservative default for _SC_NPROCESSORS_ONLN (swbz#21542)
+
 * Tue Jul 04 2017 Florian Weimer <fweimer@redhat.com> - 2.25.90-19
 - Auto-sync with upstream master,
   commit 4446a885f3aeb3a33b95c72bae1f115bed77f0cb.
diff --git a/sources b/sources
index 3fe28d1..1e39d20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-671-g4446a88.tar.gz) = 7f92b9a6423d1953274d01e90c6684518c299ba6213a75503da036fd5089fae8f1e325a6984daa51bc6efb007e86d8e3e155b91315e0f16c7389f60f831b11a9
+SHA512 (glibc-2.25-685-g031e519.tar.gz) = 2d22fa77596549e2dd30c635dba922774a6854e370c6578b6fa18712cdfc2c17517ab011bf82d00574447c967bddbb658260c8a0279351f164b5b3a0198672cd