From: Stefan Liebler <stli@linux.ibm.com>
Date: Tue, 6 Aug 2019 13:49:08 +0000 (+0200)
Subject: s390: Fix Enable VDSO for static linking
X-Git-Tag: changelog-ends-here~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d454abeb444db805fb504ecf256b6c2e3e25e04;p=thirdparty%2Fglibc.git

s390: Fix Enable VDSO for static linking

The commit 5e855c8954014bca7b0d6f07312ec09553695ffd
"s390: Enable VDSO for static linking" removed the definition of VDSO_SETUP
which leads to not setup the vdso symbols.
Instead it jumps to false addresses.

This patch just re adds the removed VDSO_SETUP macro definition.

ChangeLog:

	* sysdeps/unix/sysv/linux/s390/init-first.c (VDSO_SETUP): New define.
---

diff --git a/ChangeLog b/ChangeLog
index e16a4a8e418..531fd18bbe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-02  Stefan Liebler  <stli@linux.ibm.com>
+
+	* sysdeps/unix/sysv/linux/s390/init-first.c (VDSO_SETUP): New define.
+
 2019-08-05  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/bits/sched.h [__USE_GNU] (CLONE_PIDFD):
diff --git a/sysdeps/unix/sysv/linux/s390/init-first.c b/sysdeps/unix/sysv/linux/s390/init-first.c
index 8c54d13935e..a1ad9458e35 100644
--- a/sysdeps/unix/sysv/linux/s390/init-first.c
+++ b/sysdeps/unix/sysv/linux/s390/init-first.c
@@ -53,4 +53,6 @@ _libc_vdso_platform_setup (void)
   VDSO_SYMBOL (getcpu) = p;
 }
 
+#define VDSO_SETUP _libc_vdso_platform_setup
+
 #include <csu/init-first.c>