aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2019-08-06 15:49:08 +0200
committerStefan Liebler <stli@linux.ibm.com>2019-08-06 15:49:08 +0200
commit8d454abeb444db805fb504ecf256b6c2e3e25e04 (patch)
treedfad13598d14cf08768fef190ab44a9304d46021
parent98013846ecc3fd195c19248ec1447d1d9a37654a (diff)
downloadglibc-8d454abeb444db805fb504ecf256b6c2e3e25e04.tar
glibc-8d454abeb444db805fb504ecf256b6c2e3e25e04.tar.gz
glibc-8d454abeb444db805fb504ecf256b6c2e3e25e04.tar.bz2
glibc-8d454abeb444db805fb504ecf256b6c2e3e25e04.zip
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.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/s390/init-first.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e16a4a8e41..531fd18bbe 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 8c54d13935..a1ad9458e3 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>