All the required code already existed, and some of it was already
running.
AT_SYSINFO_EHDR is processed if NEED_DL_SYSINFO_DSO is defined, but it
looks like it always is. The call to setup_vdso is also unconditional,
so all that was left to do was setup the function pointers and use
them.
This patch just replaces some #ifdef SHARED with a new USE_VSYSCALL. It
is always defined when SHARED is and is always defined on x86_64.
---
I intend to change all architectures, but it seems better to change one
at a time so that if one architecture has a special requirement it will
be easier to spot.
Since sysdeps/unix/sysv/linux/sysdep-vdso.h is used by multiple
architectures, we cannot just remove the #ifdef as done in the previous
patch.
2018-09-30 Rafael Ávila de Espíndola <rafael@espindo.la>
[BZ #19767]
* Makeconfig: Add -DUSE_VSYSCALL to CPPFLAGS-.os.
* nptl/Makefile: Add tst-cond11-static to tests-static and tests.
* nptl/tst-cond11-static.c: New File.
* sysdeps/unix/sysv/linux/Makefile: Add tst-affinity-static to
tests-static and tests
* sysdeps/unix/sysv/linux/sysdep-vdso.h: Use USE_VSYSCALL instead
of SHARED.
* sysdeps/unix/sysv/linux/tst-affinity-static.c: New file.
* sysdeps/unix/sysv/linux/x86/libc-vdso.h: Use USE_VSYSCALL
instead of SHARED.
* sysdeps/unix/sysv/linux/x86_64/init-first.c: remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: define USE_VSYSCALL.
@@ -999,7 +999,7 @@ ifeq (yes,$(build-shared))
# Under --enable-shared, we will build a shared library of PIC objects.
# The PIC object files are named foo.os.
object-suffixes += .os
-CPPFLAGS-.os = -DPIC -DSHARED
+CPPFLAGS-.os = -DPIC -DSHARED -DUSE_VSYSCALL
CFLAGS-.os = $(filter %frame-pointer,$(+cflags)) $(pic-ccflag)
libtype.os := lib%_pic.a
# This can be changed by a sysdep makefile
@@ -449,9 +449,10 @@ link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \
tst-cancel21-static tst-cancel24-static tst-cond8-static \
tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
- tst-sem12-static
+ tst-sem12-static tst-cond11-static
+
tests += tst-cancel21-static tst-cancel24-static \
- tst-cond8-static
+ tst-cond8-static tst-cond11-static
tests-internal += tst-sem11-static tst-sem12-static tst-stackguard1-static
xtests-static += tst-setuid1-static
new file mode 100644
@@ -0,0 +1 @@
+#include "tst-cond11.c"
@@ -143,6 +143,9 @@ sysdep_routines += sched_getcpu oldglob
tests += tst-affinity tst-affinity-pid
+tests-static := tst-affinity-static
+tests += $(tests-static)
+
CFLAGS-fork.c = $(libio-mtsafe)
CFLAGS-getpid.o = -fomit-frame-pointer
CFLAGS-getpid.os = -fomit-frame-pointer
@@ -26,13 +26,11 @@
funcptr (args)
#endif
-#ifdef SHARED
+#if defined(HAVE_VSYSCALL) && defined(USE_VSYSCALL)
-# ifdef HAVE_VSYSCALL
+# include <libc-vdso.h>
-# include <libc-vdso.h>
-
-# define INLINE_VSYSCALL(name, nr, args...) \
+# define INLINE_VSYSCALL(name, nr, args...) \
({ \
__label__ out; \
__label__ iserr; \
@@ -61,7 +59,7 @@
sc_ret; \
})
-# define INTERNAL_VSYSCALL(name, err, nr, args...) \
+# define INTERNAL_VSYSCALL(name, err, nr, args...) \
({ \
__label__ out; \
long v_ret; \
@@ -79,20 +77,12 @@
out: \
v_ret; \
})
-# else
-# define INLINE_VSYSCALL(name, nr, args...) \
- INLINE_SYSCALL (name, nr, ##args)
-# define INTERNAL_VSYSCALL(name, err, nr, args...) \
- INTERNAL_SYSCALL (name, err, nr, ##args)
-# endif /* HAVE_VSYSCALL */
+#else
-# else /* SHARED */
-
-# define INLINE_VSYSCALL(name, nr, args...) \
+# define INLINE_VSYSCALL(name, nr, args...) \
INLINE_SYSCALL (name, nr, ##args)
-# define INTERNAL_VSYSCALL(name, err, nr, args...) \
+# define INTERNAL_VSYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL (name, err, nr, ##args)
-#endif /* SHARED */
-
+#endif /* defined(HAVE_VSYSCALL) && defined(USE_VSYSCALL) */
#endif /* SYSDEP_VDSO_LINUX_H */
new file mode 100644
@@ -0,0 +1 @@
+#include "tst-affinity.c"
@@ -22,7 +22,7 @@
#include <time.h>
#include <sys/time.h>
-#ifdef SHARED
+#ifdef USE_VSYSCALL
# include <sysdep-vdso.h>
@@ -16,11 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifdef SHARED
-# include <time.h>
-# include <sysdep.h>
-# include <dl-vdso.h>
-# include <libc-vdso.h>
+#include <time.h>
+#include <sysdep.h>
+#include <dl-vdso.h>
+#include <libc-vdso.h>
long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *)
attribute_hidden;
@@ -46,7 +45,6 @@ __vdso_platform_setup (void)
VDSO_SYMBOL(getcpu) = p;
}
-# define VDSO_SETUP __vdso_platform_setup
-#endif
+#define VDSO_SETUP __vdso_platform_setup
#include <csu/init-first.c>
@@ -18,6 +18,11 @@
#ifndef _LINUX_X86_64_SYSDEP_H
#define _LINUX_X86_64_SYSDEP_H 1
+/* Always enable vsyscalls on x86_64 */
+#ifndef USE_VSYSCALL
+#define USE_VSYSCALL
+#endif
+
/* There is some commonality. */
#include <sysdeps/unix/sysv/linux/sysdep.h>
#include <sysdeps/unix/x86_64/sysdep.h>