From patchwork Tue Sep 24 11:41:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 1166519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-105332-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="cMWUQjLp"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46czmH4JjMz9sPD for ; Tue, 24 Sep 2019 21:41:18 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=wb0iJ eAAm+Br6uTsSpL1SFBQxe1oPOeREsLba214JNAZRn8mWiKsMRzeIgwyeKciHPXHv blD94oBmY7EwyuO5s4bHdPutIgSpW+1CsUsVw87Ln/2yKmsrtCLhOzUnz3VqgRb2 0m0ryE0F4RegeZOd9UJi8qkmRorVPQSHRtfWxg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=m21xswuOold IqSB8zo66dhK0iLY=; b=cMWUQjLp3TDWj4L9iCoziDkLzTZRuti4uDxOY4TQZzE hKujv1W54hX6SxeyUGk1u4jcIH+1h2ayh4GwRJfVFqsoNxLTuCc200z5hJVrnCXK CIanei4jhKHCrX3RjnTpb6Njv1Ro2i54t4Su0VCwByoU1hvV6vxXz4X9FE31NZmo = Received: (qmail 26362 invoked by alias); 24 Sep 2019 11:41:12 -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 26347 invoked by uid 89); 24 Sep 2019 11:41:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de From: Andreas Schwab To: Adhemerval Zanella Cc: libc-alpha@sourceware.org Subject: [PATCH] Fix vDSO initialization on arm and mips References: <20190905205620.4646-1-adhemerval.zanella@linaro.org> <20190905205620.4646-2-adhemerval.zanella@linaro.org> X-Yow: Now, I think it would be GOOD to buy FIVE or SIX STUDEBAKERS and CRUISE for ARTIFICIAL FLAVORING!! Date: Tue, 24 Sep 2019 13:41:08 +0200 In-Reply-To: <20190905205620.4646-2-adhemerval.zanella@linaro.org> (Adhemerval Zanella's message of "Thu, 5 Sep 2019 17:56:14 -0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 * sysdeps/unix/sysv/linux/arm/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL): Define to "__vdso_clock_gettime", not "__vdso_gettimeofday". (HAVE_GETTIMEOFDAY_VSYSCALL): Define to "__vdso_gettimeofday", not "__vdso_clock_gettime". * sysdeps/unix/sysv/linux/mips/sysdep.h (HAVE_CLOCK_GETTIME_VSYSCALL): Define to "__vdso_clock_gettime", not "__vdso_gettimeofday". (HAVE_GETTIMEOFDAY_VSYSCALL): Define to "__vdso_gettimeofday", not "__vdso_clock_gettime". diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h index f9cc9335f5..e9e022e037 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep.h @@ -392,8 +392,8 @@ __local_syscall_error: \ #define VDSO_HASH 61765110 /* List of system calls which are supported as vsyscalls. */ -#define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_gettimeofday" -#define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_clock_gettime" +#define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" +#define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" #define LOAD_ARGS_0() #define ASM_ARGS_0 diff --git a/sysdeps/unix/sysv/linux/mips/sysdep.h b/sysdeps/unix/sysv/linux/mips/sysdep.h index b2045fcc55..82a3cf9f3d 100644 --- a/sysdeps/unix/sysv/linux/mips/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/sysdep.h @@ -20,8 +20,8 @@ #define VDSO_HASH 61765110 /* List of system calls which are supported as vsyscalls. */ -#define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_gettimeofday" -#define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_clock_gettime" +#define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" +#define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" #ifndef __ASSEMBLER__