diff options
| author | Rafael Ávila de Espíndola <rafael@espindo.la> | 2018-12-10 21:27:54 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-12-10 21:27:54 +0000 |
| commit | f9ba9eb821c96ae41038460ee1fcd42308e074f2 (patch) | |
| tree | aef1c7d7f5afed635afd425dad005f77a1239e9d /sysdeps/unix | |
| parent | 8d20a2f414fa52aceef8a0e3675415df54a840db (diff) | |
| download | glibc-f9ba9eb821c96ae41038460ee1fcd42308e074f2.tar glibc-f9ba9eb821c96ae41038460ee1fcd42308e074f2.tar.gz glibc-f9ba9eb821c96ae41038460ee1fcd42308e074f2.tar.bz2 glibc-f9ba9eb821c96ae41038460ee1fcd42308e074f2.zip | |
Enable VDSO for static linking on mips
I have tested that this builds and the resulting program still work.
This was tested on gcc23.fsffrance.org, and for some reason the vdso
there seems unused even when using shared libraries.
[BZ #19767]
* sysdeps/unix/sysv/linux/mips/init-first.c: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/mips/libc-vdso.h: Remove #ifdef SHARED.
* sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Define
ALWAYS_USE_VSYSCALL.
* sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Define
ALWAYS_USE_VSYSCALL.
* sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h: Define
ALWAYS_USE_VSYSCALL.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/init-first.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/libc-vdso.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips32/sysdep.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h | 3 |
5 files changed, 13 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/init-first.c b/sysdeps/unix/sysv/linux/mips/init-first.c index 0cf8279c73..2e04a6b050 100644 --- a/sysdeps/unix/sysv/linux/mips/init-first.c +++ b/sysdeps/unix/sysv/linux/mips/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> int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); @@ -38,7 +37,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/mips/libc-vdso.h b/sysdeps/unix/sysv/linux/mips/libc-vdso.h index c36e22dc40..f8f89fbcf2 100644 --- a/sysdeps/unix/sysv/linux/mips/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/mips/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 int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); -#endif - #endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h index cbe9cd2bda..2d6e0234b6 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h @@ -18,6 +18,9 @@ #ifndef _LINUX_MIPS_MIPS32_SYSDEP_H #define _LINUX_MIPS_MIPS32_SYSDEP_H 1 +/* Always enable vsyscalls on mips32. */ +#define ALWAYS_USE_VSYSCALL 1 + /* There is some commonality. */ #include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/mips/mips32/sysdep.h> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h index 8e3117d7a7..5c8181cd29 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h @@ -18,6 +18,9 @@ #ifndef _LINUX_MIPS_SYSDEP_H #define _LINUX_MIPS_SYSDEP_H 1 +/* Always enable vsyscalls on n32. */ +#define ALWAYS_USE_VSYSCALL 1 + /* There is some commonality. */ #include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/mips/mips64/n32/sysdep.h> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h index c9046a06b8..7c71d1ed12 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h @@ -18,6 +18,9 @@ #ifndef _LINUX_MIPS_SYSDEP_H #define _LINUX_MIPS_SYSDEP_H 1 +/* Always enable vsyscalls on n64. */ +#define ALWAYS_USE_VSYSCALL 1 + /* There is some commonality. */ #include <sysdeps/unix/sysv/linux/sysdep.h> #include <sysdeps/unix/mips/mips64/n64/sysdep.h> |