From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4928CC433F5 for ; Tue, 19 Oct 2021 22:37:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CE5F60F46 for ; Tue, 19 Oct 2021 22:37:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229833AbhJSWjT (ORCPT ); Tue, 19 Oct 2021 18:39:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229734AbhJSWjP (ORCPT ); Tue, 19 Oct 2021 18:39:15 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50150C061749 for ; Tue, 19 Oct 2021 15:36:57 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id z2-20020a254c02000000b005b68ef4fe24so27271026yba.11 for ; Tue, 19 Oct 2021 15:36:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=a45Ln1D7ZtUe/1bUcSj9pWfb4TeXSMsuqA08OUNsoW4=; b=C/DPg6WFYTFDt0YKudnJRZv5vE52p5pGFx+/sMVLqwD0LssuUyyGBJ3fde+wDbZRPZ xwTLlo3xgrX02h+KdBL5fgDs68VKSfWKbonXwRKp75pJaE2Fs2/dSZJXUYdWsYtWrovR JTkfgi9YKuZoSXnu/vpN2yBzHd40RVKM6ALN9x/YJLtuSdyOhc1nYR6yGsOcz1NoRoOt lIQoRmr/3YOoZ5dHhQY6BdxkWA9V7HFgvB2hu1IUhzs6BP/L/hbwOXETYV7KP03vjNBP WTaktCWsUCD36jEu2nbiNsN9UwCHj51jMSsbf0/5Jyc1wHcYpH+KSCe9FlPsJSA84vwW LfUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=a45Ln1D7ZtUe/1bUcSj9pWfb4TeXSMsuqA08OUNsoW4=; b=aSX3VoPK4SHPucbhNS6615umEsugWTEHZQFxn0FHqF8S/tGTiH9DyIXdIeTUrB3efI ECgCJYnNe6VPBWbplKeMBiqKC0I+J68C4yh+BwdUG5unfvd2eiXATT+xjQlVoN0PH88r InHNagVbLtV5MaAZcc7CzGJ3/kiEbQHVUa6M7l21yFS7+8l5V0Syc7AnbOGpNZ46UyBj DJuzQJrE+cw6gyfqXIP68WkSou1f3/nPPM/rM7epSJx9bUNJb4GVlf34v/NPHz26E5n4 ypgvdn6Qi+mxY1N0rFzlKxqhdDeaTAMq2vimtOoYX4j3360lvrkBiJ6wXDnF4X4u9X07 mIZQ== X-Gm-Message-State: AOAM532hRAGWORu6sW8uLXfh/h8DGmfeSGHFgMzIC9l29QfPx0+G2mV7 hpuVzdD5QJMALhd4u//eOPuldRqHNuhQCkFzzS8= X-Google-Smtp-Source: ABdhPJyXa/oHkLzXSjbRGWB4SvAFLikU2/e7o0757AHdoqspRbjhCNfLFsD1Qx0hu2ir4MF3GcgZRiwsvvvOQHF6YTE= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:de0:247b:5157:7c15]) (user=ndesaulniers job=sendgmr) by 2002:a25:1c86:: with SMTP id c128mr39976792ybc.83.1634683016574; Tue, 19 Oct 2021 15:36:56 -0700 (PDT) Date: Tue, 19 Oct 2021 15:36:44 -0700 In-Reply-To: <20211019223646.1146945-1-ndesaulniers@google.com> Message-Id: <20211019223646.1146945-3-ndesaulniers@google.com> Mime-Version: 1.0 References: <20211019223646.1146945-1-ndesaulniers@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=lvO/pmg+aaCb6dPhyGC1GyOCvPueDrrc8Zeso5CaGKE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1634683006; l=2182; s=20211004; h=from:subject; bh=jpMXqOpkcp5RnayWtEE83+1uBxJkTa7ynpwJrViYoAw=; b=qajt0gNdxEY2kp9cPSmK3GU6yiC5ml6CaoZHQWk8SysT+y/gX1h8ncSkCbc3LnKtUjBh+GDKxiPX QOoEOn45D9GObiCd0QkxIAnJhaSyyD8a/SFgguZpKzwFLe3+hHnS X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 2/4] arm64: vdso32: drop test for -march=armv8-a From: Nick Desaulniers To: Catalin Marinas , Will Deacon Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vincenzo Frascino , Nathan Chancellor , Nick Desaulniers , Arnd Bergmann Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As Arnd points out: gcc-4.8 already supported -march=armv8, and we require gcc-5.1 now, so both this #if/#else construct and the corresponding "cc32-option,-march=armv8-a" check should be obsolete now. Link: https://lore.kernel.org/lkml/CAK8P3a3UBEJ0Py2ycz=rHfgog8g3mCOeQOwO0Gmp-iz6Uxkapg@mail.gmail.com/ Suggested-by: Arnd Bergmann Signed-off-by: Nick Desaulniers --- arch/arm64/include/asm/vdso/compat_barrier.h | 7 ------- arch/arm64/kernel/vdso32/Makefile | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h index fb60a88b5ed4..3ac35f4a667c 100644 --- a/arch/arm64/include/asm/vdso/compat_barrier.h +++ b/arch/arm64/include/asm/vdso/compat_barrier.h @@ -20,16 +20,9 @@ #define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory") -#if __LINUX_ARM_ARCH__ >= 8 #define aarch32_smp_mb() dmb(ish) #define aarch32_smp_rmb() dmb(ishld) #define aarch32_smp_wmb() dmb(ishst) -#else -#define aarch32_smp_mb() dmb(ish) -#define aarch32_smp_rmb() aarch32_smp_mb() -#define aarch32_smp_wmb() dmb(ishst) -#endif - #undef smp_mb #undef smp_rmb diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 89299a26638b..1407516e041e 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -65,13 +65,7 @@ endif # From arm vDSO Makefile VDSO_CAFLAGS += -fPIC -fno-builtin -fno-stack-protector VDSO_CAFLAGS += -DDISABLE_BRANCH_PROFILING - - -# Try to compile for ARMv8. If the compiler is too old and doesn't support it, -# fall back to v7. There is no easy way to check for what architecture the code -# is being compiled, so define a macro specifying that (see arch/arm/Makefile). -VDSO_CAFLAGS += $(call cc32-option,-march=armv8-a -D__LINUX_ARM_ARCH__=8,\ - -march=armv7-a -D__LINUX_ARM_ARCH__=7) +VDSO_CAFLAGS += -march=armv8-a VDSO_CFLAGS := $(VDSO_CAFLAGS) VDSO_CFLAGS += -DENABLE_COMPAT_VDSO=1 -- 2.33.0.1079.g6e70778dc9-goog