From patchwork Fri Mar 26 00:04:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 409773 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C78BCC433C1 for ; Fri, 26 Mar 2021 00:06:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A355B61A0A for ; Fri, 26 Mar 2021 00:06:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbhCZAFe (ORCPT ); Thu, 25 Mar 2021 20:05:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:60294 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229631AbhCZAFF (ORCPT ); Thu, 25 Mar 2021 20:05:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 995C261A0A; Fri, 26 Mar 2021 00:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616717105; bh=wK/BFrBTE/0tBXGMmuGyDcFbZJG2Gsid1VRthtJvonc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UeGYgk1XDEILPxorhA3iIVOF9HnzT+TEjpYcjpbwI7twldA4T0jU3SED2npzBIDem fzgPMI+3s5OPIj2jRkkctakVjbfwyW87TLa+P8KBfayXrui20WDjiRMfmGRmCiblec 6IhLRgF/XhD62Ua1REDHkqogfIRwmEkgBJ8Rz1feIy8rM2iPuRZ4raqHtl5c2HfSbw mcFNjzDD7poz5tdSSkXy4bLVWWbsTFp1Z667x+jBEsOiI5tAuSi3YBQPc33TeMuZqE 2xZeAvQB7bP3MzFVs/JtvjO3KBI1awX2vK+xYMj13zu7+izYxFIioK6KDmaiKTOMnM fgUvgzMvUhQag== From: Nathan Chancellor To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, Ard Biesheuvel Cc: Nick Desaulniers , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Nathan Chancellor Subject: [PATCH 3/3] efi/libstub: Add $(CLANG_FLAGS) to x86 flags Date: Thu, 25 Mar 2021 17:04:35 -0700 Message-Id: <20210326000435.4785-4-nathan@kernel.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210326000435.4785-1-nathan@kernel.org> References: <20210326000435.4785-1-nathan@kernel.org> MIME-Version: 1.0 X-Patchwork-Bot: notify Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org When cross compiling x86 on an ARM machine with clang, there are several errors along the lines of: arch/x86/include/asm/page_64.h:52:7: error: invalid output constraint '=D' in asm This happens because the x86 flags in the EFI stub are not derived from KBUILD_CFLAGS like the other architectures are and the clang flags that set the target architecture ('--target=') and the path to the GNU cross tools ('--prefix=') are not present, meaning that the host architecture is targeted. These flags are available as $(CLANG_FLAGS) from the main Makefile so add them to the cflags for x86 so that cross compiling works as expected. Signed-off-by: Nathan Chancellor --- drivers/firmware/efi/libstub/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index c23466e05e60..d0537573501e 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -13,7 +13,8 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__KERNEL__ \ -Wno-pointer-sign \ $(call cc-disable-warning, address-of-packed-member) \ $(call cc-disable-warning, gnu) \ - -fno-asynchronous-unwind-tables + -fno-asynchronous-unwind-tables \ + $(CLANG_FLAGS) # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly # disable the stackleak plugin