aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-05-30 09:47:48 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-08-05 16:38:25 -0300
commitc9c1a413c01eeda679896ebb761f8feb5236fe9c (patch)
treeaf1014921e19d49f80e8d8988778e9e581bd719e
parent5e855c8954014bca7b0d6f07312ec09553695ffd (diff)
downloadglibc-c9c1a413c01eeda679896ebb761f8feb5236fe9c.zip
glibc-c9c1a413c01eeda679896ebb761f8feb5236fe9c.tar.gz
glibc-c9c1a413c01eeda679896ebb761f8feb5236fe9c.tar.bz2
sparc: Enable VDSO for static linking
Checked on sparc64-linux-gnu and sparcv9-linux-gnu. [BZ #19767] * sysdeps/unix/sysv/linux/sparc/init-first.c: Remove #ifdef SHARED. * sysdeps/unix/sysv/linux/sparc/libc-vdso.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sysdep.h (ALWAYS_USE_VSYSCALL): Define.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/init-first.c8
-rw-r--r--sysdeps/unix/sysv/linux/sparc/libc-vdso.h6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sysdep.h3
4 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c9d7631..5fd2019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2019-08-05 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #19767]
+ * sysdeps/unix/sysv/linux/sparc/init-first.c: Remove #ifdef SHARED.
+ * sysdeps/unix/sysv/linux/sparc/libc-vdso.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sysdep.h (ALWAYS_USE_VSYSCALL):
+ Define.
+
+ [BZ #19767]
* sysdeps/unix/sysv/linux/s390/init-first.c: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/s390/libc-vdso.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
diff --git a/sysdeps/unix/sysv/linux/sparc/init-first.c b/sysdeps/unix/sysv/linux/sparc/init-first.c
index de83321..643d6c7 100644
--- a/sysdeps/unix/sysv/linux/sparc/init-first.c
+++ b/sysdeps/unix/sysv/linux/sparc/init-first.c
@@ -17,9 +17,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifdef SHARED
-# include <dl-vdso.h>
-# include <libc-vdso.h>
+#include <dl-vdso.h>
+#include <libc-vdso.h>
long int (*VDSO_SYMBOL (gettimeofday)) (struct timeval *, void *)
attribute_hidden;
@@ -40,7 +39,6 @@ _libc_vdso_platform_setup (void)
VDSO_SYMBOL (clock_gettime) = p;
}
-# define VDSO_SETUP _libc_vdso_platform_setup
-#endif
+#define VDSO_SETUP _libc_vdso_platform_setup
#include <csu/init-first.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/libc-vdso.h b/sysdeps/unix/sysv/linux/sparc/libc-vdso.h
index 4009b00..d20afcd 100644
--- a/sysdeps/unix/sysv/linux/sparc/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/sparc/libc-vdso.h
@@ -20,14 +20,10 @@
#ifndef _LIBC_VDSO_H
#define _LIBC_VDSO_H
-#ifdef SHARED
-
-# include <sysdep-vdso.h>
+#include <sysdep-vdso.h>
extern long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
attribute_hidden;
extern long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
-#endif
-
#endif /* _LIBC_VDSO_H */
diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h
index 981b2a2..fc4053c 100644
--- a/sysdeps/unix/sysv/linux/sparc/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h
@@ -19,6 +19,9 @@
#ifndef _LINUX_SPARC_SYSDEP_H
#define _LINUX_SPARC_SYSDEP_H 1
+/* Always enable vsyscalls on sparc */
+#define ALWAYS_USE_VSYSCALL 1
+
#include <sysdeps/unix/sysdep.h>
#include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/sparc/sysdep.h>