From 669790c2cf49f22ff3a67427e3fe5d11d37c66ca Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Jul 06 2017 13:07:54 +0000
Subject: Auto-sync with upstream release/2.25/master


Upstream commit: 49f97e641e4e84a42246655d30adbc4756e67114

- x86-64: Align the stack in __tls_get_addr (#1440287)

---

diff --git a/glibc.spec b/glibc.spec
index 7b5dc91..c811423 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-23-gadc7e06
+%define glibcsrcdir  glibc-2.25-24-g49f97e6
 %define glibcversion 2.25
-%define glibcrelease 6%{?dist}
+%define glibcrelease 7%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2270,6 +2270,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jul 06 2017 Florian Weimer <fweimer@redhat.com> - 2.25-7
+- Auto-sync with upstream release/2.25/master,
+  commit 49f97e641e4e84a42246655d30adbc4756e67114:
+- x86-64: Align the stack in __tls_get_addr (#1440287)
+
 * Tue Jun 20 2017 Florian Weimer <fweimer@redhat.com> - 2.25-6
 - Auto-sync with upstream release/2.25/master,
   commit adc7e06fb412a2a1ee52f8cb788caf436335b9f3, fixing:
diff --git a/sources b/sources
index 3405ea6..7a90908 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-23-gadc7e06.tar.gz) = b497138d26dd2f5d0ff225608d1ae1d9e72746827c1b9f695a809550b53e77927db0dd408b511291016fb855a99035de8e78bcc08bf62435f9a75cd7642c570d
+SHA512 (glibc-2.25-24-g49f97e6.tar.gz) = 277039923a26b20b91dc761b5a8e323282bb912f0049c893fa50c839374425bb2500e88abab7c4cbc12bb79ac75863df8be381e287729a3294f08242ba43947c