From patchwork Sat Nov 24 23:24:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rafael Avila de Espindola X-Patchwork-Id: 30278 Received: (qmail 73009 invoked by alias); 24 Nov 2018 23:25:02 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 72795 invoked by uid 89); 24 Nov 2018 23:24:49 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail4.protonmail.ch Date: Sat, 24 Nov 2018 23:24:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=espindo.la; s=protonmail; t=1543101870; bh=NfyiCwew0DWWxP29tGJYEYA57o3/LtaD9bVt6f4HTxw=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=ml+AwQPaaXosslix1GTxUx0QkA5/dsHq8u+td28xaXaH21lhJ+91ZEENqcL5eTuUb VkkKSkeNRGQQx0wfCVgIvVkR286UdOm4loGZibuhssEaW6QiJ0c1hy5IebKpquqgeG vMSUlOdNFmMeCfeFMnGlxDQFvSagXoHncUWA0q9E= To: libc-alpha@sourceware.org From: =?UTF-8?Q?Rafael_=C3=81vila_de_Esp=C3=ADndola?= Cc: adhemerval.zanella@linaro.org, Rafael Avila de Espindola Reply-To: =?UTF-8?Q?Rafael_=C3=81vila_de_Esp=C3=ADndola?= Subject: [PATCH] Enable VDSO on static on aarch64. Message-ID: MIME-Version: 1.0 From: Rafael Avila de Espindola Reviewed-by: Szabolcs Nagy --- 2018-11-24 Rafael Ávila de Espíndola [BZ #19767] * sysdeps/unix/sysv/linux/aarch64/init-first.c: remove #ifdef SHARED. * sysdeps/unix/sysv/linux/aarch64/libc-vdso.h: remove #ifdef SHARED. * sysdeps/unix/sysv/linux/aarch64/sysdep.h: define ALWAYS_USE_VSYSCALL. diff --git a/sysdeps/unix/sysv/linux/aarch64/init-first.c b/sysdeps/unix/sysv/linux/aarch64/init-first.c index 4c1895a1b9..cdc34bd1c1 100644 --- a/sysdeps/unix/sysv/linux/aarch64/init-first.c +++ b/sysdeps/unix/sysv/linux/aarch64/init-first.c @@ -16,9 +16,8 @@ License along with the GNU C Library; if not, see . */ -#ifdef SHARED -# include -# include +#include +#include int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); @@ -46,7 +45,6 @@ _libc_vdso_platform_setup (void) VDSO_SYMBOL(clock_getres) = p; } -# define VDSO_SETUP _libc_vdso_platform_setup -#endif +#define VDSO_SETUP _libc_vdso_platform_setup #include diff --git a/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h b/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h index 65b2228662..9d47ce12c0 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/aarch64/libc-vdso.h @@ -19,15 +19,11 @@ #ifndef _LIBC_VDSO_H #define _LIBC_VDSO_H -#ifdef SHARED - -# include +#include extern int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden; extern int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); extern int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *); -#endif - #endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 9ac2f0702a..dc529d22fb 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -19,6 +19,9 @@ #ifndef _LINUX_AARCH64_SYSDEP_H #define _LINUX_AARCH64_SYSDEP_H 1 +/* Always enable vsyscalls on aarch64 */ +#define ALWAYS_USE_VSYSCALL 1 + #include #include #include