From patchwork Sun Apr 11 09:21:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1464767 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=BMVuQuGI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FJ5yh6NNxz9sV5 for ; Sun, 11 Apr 2021 19:23:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 24ADE804E7; Sun, 11 Apr 2021 11:23:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="BMVuQuGI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 605A8804B9; Sun, 11 Apr 2021 11:23:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 42BD1801FD for ; Sun, 11 Apr 2021 11:23:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1618132977; bh=3ll8u+IuXCoLXoRA4/lruql2GnUK+pIKxQ4eLRWMiZE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=BMVuQuGIm1fqE9v6dP4NNN3zYbU5nBTJc+i3MTuBU8rRHaMqjH6VG3zP5kdyHPIAX iyvUSECOtpKUcSIHqjzlAIcRUhP2LcLaU5eq5XnR85J9czTcG1yp+rkPEaXYmYyfsH LHkgaD9OZ/870VabLScSmzP9HEGNpFX4tsdu/Avo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MORAa-1lCJ823LXa-00PvL0; Sun, 11 Apr 2021 11:22:56 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: u-boot@lists.denx.de, Rick Chen , Simon Glass , Bin Meng , Joel Peshkin , Heinrich Schuchardt Subject: [PATCH v10 2/3] x86: correct usage of CFLAGS_NON_EFI Date: Sun, 11 Apr 2021 11:21:57 +0200 Message-Id: <20210411092158.5244-3-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210411092158.5244-1-xypron.glpk@gmx.de> References: <20210411092158.5244-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:L+SfJ+iMYuRLV8g2OQ6Br4rYAWPBdE5E7XhFzCJFVG6DR9rnjsB cmsTLIhxb0hHsh1oF3vHnvjvdqpc+Phqf92k/sbPhRO/ZpMdSSND4mZVfJjWNF1qmvnOKwL exIFNJM9a/7YaCQ9OCIH8MK/mbMweEaS7lnizQvO5G/dzVUrEwugcSpQJIBEnKqmMBNpZaH WAwp0uhn4Ke6xMbg6nj4A== X-UI-Out-Filterresults: notjunk:1;V03:K0:twy4cdxHMyU=:cfHmWHr2xnonGp/h8gYCEv 44thoSEJdnC4w3t2iMynnytfu6vTZPQKdVBVk3dbYGOqJ0iwAFsPhaDFWGrwzO7obqcojof08 dofwknBCKMOyGAaVQkqkVS0uNkbjwXQwz9zDDl7vqYa225EpSKg0LeQ+PP6ygzMukIJ1cP30a Xk8EoiIubRRsQfXlgqgsXoMF5YKV3eroIoj5CDsNYDAmygsSxZhdz7SbPBwBI0DELfjAJCscw J0c2+kMLEcFpOXZAazDOO49bnryDSiILeEQvoMZg1I4siB/b5zsJBeJj9Rbjo7T3hyMmJj1yM oclPWR8aiMH1jqQ9MaOwqWMGShlI7jdQt8yr2HNKUhDgUJfykmwS8XY4lV8LkUaPZ23aaHHn9 GbH9kEVFLXkOcJlB3DNeiBc883NOnlIt+74JLZQEC0NRUyrA7T+HAwDRbPTWAABH3TuwEH9Wm sUCWc2iwHsbcPG6vkf74zNcyRH0WGO3y/F09vf0Eq+FXKyxeUNBGoI4DoNsNFeBblC9k6PWnY ASqHVG/iK/uECyTAeSEzNxaK8EZrcC4Rq+SkwobYInLtXyuOYNuyJnDbGXq12WMPYPA8JYxYd RZwbk9OwOdvSbJfALkFXjCQJATjwvL1l2QOoayrOSHk8dmKU1iuIQENRruCF2NYsd8ztJlTfl D6GcTQt/4LXCK+/AatpC5A2KaxmLDrzgRFIT6lWpqSdLd/JIxeRfn3derrY8JSuyHXFV2n5qh 1RGi8oQFNz2yOkRPXMivYN0GVY5vek4gIOiZthMBJn85EXQ+5YolZzX0VqQ5tKGImLWBHP+4w KE+29kueWp5LS3T7NhryFU4V6r92g0hnlJ1/tiMZgajiKNLB47+HQdPhb3ixJTR6XZeekz7un uXNBfxfky4l3lav2X355zQB4v2t/QCp/bvzaSmWUE4sQtgns1VbEzN6b8BPEvBCAHTKLYnlrr yGs2tnAWFVxw0l7nohtGxxVC57M9tDXyHtcLUjqIkI9yC5KV2AG5G48tDPOfQ3bNlju3dSet1 wJoWz1+fT+E+awFa5b3v9ydkHVbda+hmHXSUQZTjMUf85e02/O8oJGUNWFv1/KxLmLozY+Vor BSqtnQcagGPRTv/Q1vFVSVJ59rA/2f5OoxS0o/1EQC9C0rIzakZXPcXuuH9A//uFl+fqKvXHM phiT98P+ielWWXImWdj54e600l+WO+rzghL6P+F175Pit2eKEy7D7cwDGpw+fg0WbNaiE= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean The current usage of the variable CFLAGS_NON_EFI on the x86 architecture deviates from other architectures. Variable CFLAGS_NON_EFI is the list of compiler flags to be removed when building UEFI applications. It is not a list of flags to be added anywhere. Signed-off-by: Heinrich Schuchardt --- v10: new patch --- arch/x86/config.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 27d8412661..3067702858 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -39,10 +39,10 @@ LDFLAGS_EFI_PAYLOAD := -Bsymbolic -Bsymbolic-functions -shared --no-undefined -s OBJCOPYFLAGS_EFI := -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ -j .rel -j .rela -j .reloc -ifeq ($(IS_32BIT),y) -CFLAGS_NON_EFI := -mregparm=3 -endif +# Compiler flags to be added when building UEFI applications CFLAGS_EFI := -fpic -fshort-wchar +# Compiler flags to be removed when building UEFI applications +CFLAGS_NON_EFI := -mregparm=3 ifeq ($(CONFIG_EFI_STUB_64BIT),) CFLAGS_EFI += $(call cc-option, -mno-red-zone) @@ -70,7 +70,9 @@ LDSCRIPT := $(LDSCRIPT_EFI) else -PLATFORM_CPPFLAGS += $(CFLAGS_NON_EFI) +ifeq ($(IS_32BIT),y) +PLATFORM_CPPFLAGS += -mregparm=3 +endif KBUILD_LDFLAGS += --emit-relocs LDFLAGS_FINAL += --gc-sections $(if $(CONFIG_SPL_BUILD),,-pie)