From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BD89321FCA296 for ; Wed, 1 Nov 2017 07:57:41 -0700 (PDT) Received: by mail-wm0-x241.google.com with SMTP id r196so5503926wmf.2 for ; Wed, 01 Nov 2017 08:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=FWAXfvFE2+qVVB2DqV0rJkR4deisNy2P4S5MuKjgy0w=; b=Bkk04O1R2kJjNTqa0DzslztNb/XEqAPDtlo3vwsceOXhjF5MTsLbW5TfLaqZ1lGtpz l9rGCwEtf/v3qwtlEZNcyHAcbDH/+Z4HurNazFE8TfbcWuYvpV/6SwC3fL/4mhPRq0gD eHw0fQv+7SXEM+hM5TaHtl83w302+CLmCd0mE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FWAXfvFE2+qVVB2DqV0rJkR4deisNy2P4S5MuKjgy0w=; b=fmCQ9tdcSA0vIfMjceJni5aOzvNFqBlcoRVXjkHX6oaai9TBNnfdiWeptDmseFB75G ejJVf1y6zmF4YhuKcZAWTGjBp+QimCaOtspMFpBgA8L1ADIIl4Mx8ocN2x5hYT9YzDDR RrjVVDYB5qxE1/IjQDGslXZtqlvWAcdhiKuCImxKsEJA/UAnA4SvbeXP/00ajiZLk0LG V31mATXD+1XNdiBCfgIjrDbqHkK83thkHsqwqUTtl2z8H86Ozd6StIK3+FvOZjI14vYO 4yYtMm9EEKDolD+KLHYdnX0LDX51VmMOMb+kR/KuO2d0qqN+9RZqC2rm3mFseYNX57z/ I4lQ== X-Gm-Message-State: AMCzsaXqjjkp0DKX4rJ6OS9vXfqUOd4KkR735tvApJEwnBPIvAmmhhy2 5/Hq6juYDjmInN/U9anonjIdPrP+l1s= X-Google-Smtp-Source: ABhQp+QC+Oh4jDnJ+/YkengrRzfz7I7u1XmD8NvZ0GuYO3AI8V1+Obu4nhxctX1+jSOrP/9noqBdXA== X-Received: by 10.28.43.130 with SMTP id r124mr458454wmr.111.1509548492666; Wed, 01 Nov 2017 08:01:32 -0700 (PDT) Received: from localhost.localdomain ([105.129.222.2]) by smtp.gmail.com with ESMTPSA id k13sm2129165wrd.95.2017.11.01.08.01.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Nov 2017 08:01:31 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, liming.gao@intel.com, yonghong.zhu@intel.com Cc: daniel.thompson@linaro.org, Ard Biesheuvel Date: Wed, 1 Nov 2017 15:01:25 +0000 Message-Id: <20171101150125.13679-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [PATCH] BaseTools/tools_def AARCH64 ARM: disable PIE linking for .aslc sources X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2017 14:57:42 -0000 Commit 1894a7c64c0a ("BaseTools/tools_def AARCH64 ARM: disable PIE linking") works around an issue that was caught due to the fact that PIE linking produces broken .acpi files. However, v2 of that fix inadvertently only applied the workaround to the normal linker command line, and not to the ASLD one, so the issue still persists. So add the missing -no-pie options for ASLD on ARM and AARCH64. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- BaseTools/Conf/tools_def.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 98df0ffc9294..aebd7d558633 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4498,8 +4498,8 @@ DEFINE GCC5_ARM_DLINK_FLAGS = DEF(GCC49_ARM_DLINK_FLAGS) -no-pie DEFINE GCC5_ARM_DLINK2_FLAGS = DEF(GCC49_ARM_DLINK2_FLAGS) -Wno-error DEFINE GCC5_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) -no-pie DEFINE GCC5_AARCH64_DLINK2_FLAGS = DEF(GCC49_AARCH64_DLINK2_FLAGS) -Wno-error -DEFINE GCC5_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS) -DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) +DEFINE GCC5_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS) -no-pie +DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) -no-pie #################################################################################### # -- 2.11.0