Enable VDSO on i386 statically linked programs

	[BZ #19767]
	* sysdeps/unix/sysv/linux/i386/init-first.c: Don't check SHARED.
	* sysdeps/unix/sysv/linux/i386/sysdep.h (ALWAYS_USE_VSYSCALL):
	New.

diff --git a/ChangeLog b/ChangeLog
index bb53b641a86efaffa08dcea5107fa28c6de94456..87d3863e7c80663140113e0af843c104038e2f24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-30  Rafael Ávila de Espíndola  <rafael@espindo.la>
+
+       [BZ #19767]
+       * sysdeps/unix/sysv/linux/i386/init-first.c: Don't check SHARED.
+       * sysdeps/unix/sysv/linux/i386/sysdep.h (ALWAYS_USE_VSYSCALL):
+       New.
+
 2018-11-30  Florian Weimer  <fweimer@redhat.com>
 
        * scripts/abilist.awk: Print "0x0" for size 0. Handle "g"/"D".

diff --git a/sysdeps/unix/sysv/linux/i386/init-first.c b/sysdeps/unix/sysv/linux/i386/init-first.c
index 82ac7f5cf27f373c053426afe1cf6b96a99886fb..6e62dd5923f5a89fb1dd1507da038186edafafea 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/init-first.c
+++ b/sysdeps/unix/sysv/linux/i386/init-first.c
@@ -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 <sysdep-vdso.h>
+#include <time.h>
+#include <sysdep.h>
+#include <dl-vdso.h>
+#include <sysdep-vdso.h>
 
 long int (*VDSO_SYMBOL (clock_gettime)) (clockid_t, struct timespec *)
   attribute_hidden;
@@ -44,7 +43,6 @@ __vdso_platform_setup (void)
   VDSO_SYMBOL (clock_gettime) = p;
 }
 
-# define VDSO_SETUP __vdso_platform_setup
-#endif
+#define VDSO_SETUP __vdso_platform_setup
 
 #include <csu/init-first.c>

diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 3255cc78b81553f894b9f30a89ffb231166b0fea..3891663a6420bcc47415d74e955405f6af1e233a 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -19,6 +19,9 @@
 #ifndef _LINUX_I386_SYSDEP_H
 #define _LINUX_I386_SYSDEP_H 1
 
+/* Always enable vsyscalls on i386 */
+#define ALWAYS_USE_VSYSCALL 1
+
 /* There is some commonality.  */
 #include <sysdeps/unix/sysv/linux/sysdep.h>
 #include <sysdeps/unix/i386/sysdep.h>