From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=uFYNCiCo; spf=pass (domain: linaro.org, ip: 209.85.214.195, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by groups.io with SMTP; Wed, 04 Sep 2019 09:34:41 -0700 Received: by mail-pl1-f195.google.com with SMTP id y1so9779051plp.9 for ; Wed, 04 Sep 2019 09:34:41 -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=Zlu5bv7u+3OkBzLBjEpxu4XgePcLN8KQm4d5Z447wME=; b=uFYNCiComOEJU7596SfghlSOLbF/uzYzmZtTxSLuJGWW4/cj0N+hC1KXJiJgnPNHTx k8dMbJi+3zrFdbgEI4YoNfwb/jeKVg2oQn4Sh9SXaBGtX11k6fmDd3KXhtFJuxfg6b6n LmQhTsL9vqBZBQwl7MHRxBKSQ8jnoR92v7OLNmLn5+D2KfZWot4m/n0P16XppWQJgVF7 d9RaTCv+DVTLQLX11XtiuDNGhLq85E7vyXNB6ry4TUJByVFvLzbQ+ypfAhaLh9KldDvh CNG3ZaARhEHMzzX32SeaxwOgtxhXZDg0FxVEgXUNor6D0rE1c9eFUFub5udviwP2hpwM pGJA== 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=Zlu5bv7u+3OkBzLBjEpxu4XgePcLN8KQm4d5Z447wME=; b=XTU1sSB4XjjgtBT15ZCllfx6WcWK+Giz3dd+TanVrY7nromxfOFAYVIH3NLqSpjSiF t6jchWSl5oSS6qYtKjocdSsSINbJKLvLEYgKdczPLznzqH7wY/PGZnKJUPI6bjOaE1QI wLLXQS7+8G5c3WxpaeuvMoVZLyVC8Avux9c2zu6NaendccUoepN99JIuaeZGydEsdxOH 4StZh9IlCq1ZnfNJfCGEViojdjXLRR7eFVVWEV4rEHswv21CuFBBKKhmjtTGbzcvI4Op FQ/v9xWIN17DqS4vZUfxqEfmDwBRFnYvwNeR+vqHU4ciVKBm3vLS1Pi0iTqaAS79VqCO Wj7A== X-Gm-Message-State: APjAAAUnUqwcYuTOnHwmg/jP3EcB1sv89zGtvV0ShlEIA8do9mcb3Nas Ct9K0pPn3sORmWJHWssIa15xMoxxwqPI9YqS X-Google-Smtp-Source: APXvYqwHxeCgIYXDx2s27wNy5fn/3yw7OIJkzY9B7diezLkM44DQDQiwcQo+1veHhwXCK+SFwxwOww== X-Received: by 2002:a17:902:8d82:: with SMTP id v2mr40808718plo.24.1567614880932; Wed, 04 Sep 2019 09:34:40 -0700 (PDT) Return-Path: Received: from e111045-lin.nice.arm.com ([104.133.8.102]) by smtp.gmail.com with ESMTPSA id g3sm25254816pfm.179.2019.09.04.09.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 09:34:40 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: jaben.carsey@intel.com, ray.ni@intel.com, zhichao.gao@intel.com, leif.lindholm@linaro.org, liming.gao@intel.com, Ard Biesheuvel Subject: [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector Date: Wed, 4 Sep 2019 09:34:34 -0700 Message-Id: <20190904163434.16836-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Incorporate the stack protector library into the AARCH64 build of the Shell binaries as a NULL library resolution, to avoid build errors when the compiler injects stack integrity checks. Signed-off-by: Ard Biesheuvel --- ShellPkg/ShellPkg.dsc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index b2065dc028d8..91493400cab7 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -58,7 +58,7 @@ DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf -[LibraryClasses.ARM] +[LibraryClasses.ARM,LibraryClasses.AARCH64] # # It is not possible to prevent the ARM compiler for generic intrinsic functions. # This library provides the instrinsic functions generate by a given compiler. @@ -69,9 +69,6 @@ # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf -[LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf - [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|16000 -- 2.17.1