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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A3162C433F5 for ; Tue, 4 Jan 2022 10:52:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 32262830EC; Tue, 4 Jan 2022 11:52:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fhUfzswk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9065C8302C; Tue, 4 Jan 2022 11:51:53 +0100 (CET) Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 74BF38302A for ; Tue, 4 Jan 2022 11:51:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-wr1-x42f.google.com with SMTP id i22so75292610wrb.13 for ; Tue, 04 Jan 2022 02:51:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hoHpZa7bY3/wXKbi187I16H359/XxGR79NNTQ049Rt4=; b=fhUfzswkV+HE07NHca2STUGAecwT7emUjuepJZXHDYSG4pdV6QpZtC/F9wuAxbvF03 NzxPRT1ORSV/HtwVFKEWf7v1P/v/FOTG0hKZo01wuDLo59QXE+ybjPSn5qgPEmq7Oox/ oLEFA+9RzrDhmhUP+Pm3xXBAXPF8+V0n1IkJc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hoHpZa7bY3/wXKbi187I16H359/XxGR79NNTQ049Rt4=; b=gKOjKzf7aykrH4cLF6TOOFpbzRVrW+wuQx2UL7eh6xBWt/8kZntQhaPweM97F5Hobd WAu7O49K0HvHVP6v3ez0jUKzRnxjeT2qcHxPbvnIeAqdobF4J5bATQVsrDNJb41UDQ/u vH3wni+sdoIpWvTr2aNazSYaK7fM4Lk+xomDXY+IwQUHdJ30V8ZJCASx42CEhsZPtGMw cBRT+swVgrRw1rsGW5Klqg8hL2Ny7acU/FhoxfLO6MXUCP0q6vdgaErM1Gizr5dcJeAG gcVC/Vz7iKXzAF1eCD6qdhq5KwZkAOdL0IG13IPqR1zT2WhBK4F/PIhuxB86FgsgLE35 5B8A== X-Gm-Message-State: AOAM531DOSM8KCSr8xRZq57UkXBdFrUEMDl3oOobnJTbqN7YDxn0rjan gnFRWT8TzGD+ALl3gks4vj7CiWWTPAclJwsM X-Google-Smtp-Source: ABdhPJz/quWGZxZETTLDtnHEq29nmyCnBCj+0wVwINeKRiYawgQzWnvj7xSF6hLGyE/k6etEITXlJw== X-Received: by 2002:a5d:6d41:: with SMTP id k1mr24139868wri.478.1641293508756; Tue, 04 Jan 2022 02:51:48 -0800 (PST) Received: from sjg1.roam.corp.google.com (bba134459.alshamil.net.ae. [217.165.114.93]) by smtp.gmail.com with ESMTPSA id m10sm38310552wms.25.2022.01.04.02.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 02:51:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Christian Melki , Tom Rini , Ilias Apalodimas , Bin Meng , Simon Glass , Alexander Graf Subject: [PATCH v9 7/9] x86: efi: Set the correct link flags for the 64-bit EFI app Date: Tue, 4 Jan 2022 03:51:16 -0700 Message-Id: <20220104105118.373365-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog In-Reply-To: <20220104105118.373365-1-sjg@chromium.org> References: <20220104105118.373365-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.103.2 at phobos.denx.de X-Virus-Status: Clean At present some 32-bit settings are used with the 64-bit app. Fix this by separating out the two cases. Be careful not to break the 64-bit payload, which needs to build a 64-bit EFI stub with a 32-bit U-Boot. Signed-off-by: Christian Melki Signed-off-by: Simon Glass --- (no changes since v5) Changes in v5: - Add new patch to set the correct link flags for the 64-bit EFI app arch/x86/config.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 589f2aed2bc..889497b6bd7 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -20,6 +20,11 @@ IS_32BIT := y endif endif +EFI_IS_32BIT := $(IS_32BIT) +ifdef CONFIG_EFI_STUB_64BIT +EFI_IS_32BIT := +endif + ifeq ($(IS_32BIT),y) PLATFORM_CPPFLAGS += -march=i386 -m32 else @@ -44,8 +49,14 @@ CFLAGS_EFI := -fpic -fshort-wchar # Compiler flags to be removed when building UEFI applications CFLAGS_NON_EFI := -mregparm=3 -fstack-protector-strong -ifeq ($(CONFIG_EFI_STUB_64BIT),) +ifeq ($(IS_32BIT),y) +EFIPAYLOAD_BFDARCH = i386 +else CFLAGS_EFI += $(call cc-option, -mno-red-zone) +EFIPAYLOAD_BFDARCH = x86_64 +endif + +ifeq ($(EFI_IS_32BIT),y) EFIARCH = ia32 EFIPAYLOAD_BFDTARGET = elf32-i386 else @@ -53,8 +64,6 @@ EFIARCH = x86_64 EFIPAYLOAD_BFDTARGET = elf64-x86-64 endif -EFIPAYLOAD_BFDARCH = i386 - LDSCRIPT_EFI := $(srctree)/arch/x86/lib/elf_$(EFIARCH)_efi.lds EFISTUB := crt0_$(EFIARCH)_efi.o reloc_$(EFIARCH)_efi.o OBJCOPYFLAGS_EFI += --target=efi-app-$(EFIARCH) -- 2.34.1.448.ga2b2bfdf31-goog