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=FusAn/zf;
 spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: leif.lindholm@linaro.org)
Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65])
 by groups.io with SMTP; Wed, 04 Sep 2019 09:37:42 -0700
Received: by mail-wm1-f65.google.com with SMTP id c10so4055429wmc.0
        for <devel@edk2.groups.io>; Wed, 04 Sep 2019 09:37:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=linaro.org; s=google;
        h=date:from:to:cc:subject:message-id:references:mime-version
         :content-disposition:in-reply-to:user-agent;
        bh=+My6EQikr5Q84nTLaHxCPg1iiKVgs4HSowE3q2cWXQI=;
        b=FusAn/zfo9YoqQFEDtplA1XdpepXM5xB02ozPtoOGK4bvXHfcOVk2qoSQBmae82VzC
         gH5Yb4lU+mNvdu+kE0B7JFXdL5UEGD7rrv2/BVJv8xRxY7vNUxgmN/yoRItcm1talf6K
         MuZhfs9I+w9fvaQWRm18dMXSHoPeWTw8Irq8XpKzcapDvzDXjI+xzFa1YEwXVlDDtFhn
         EEoYAwQ9yzFWnlpwEUW0n+ldy0NM2RodKUnAWMvEiFUPsPtpQJ1ddn6FDLTdMFh5nQu9
         bzCAJc5CzMPiVPsfUazcJgM/CJF55XwQ6Q6HBV7nIYcja0ES6iI3DSezZn7cB5lcLd8J
         llAw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:date:from:to:cc:subject:message-id:references
         :mime-version:content-disposition:in-reply-to:user-agent;
        bh=+My6EQikr5Q84nTLaHxCPg1iiKVgs4HSowE3q2cWXQI=;
        b=Rt4jiXAXOM+E+MByo5dEM0TWdrWOcSNNBgA4Zp4MmoeGVtkRg/n8RmfWoCA6YsHJBg
         EKtttV48yfcSNPIAfXbZwsJW0aW7hcCaZi02hn7NUgOldDAQW8Lisz33p48XTKkiQCJP
         4jrgtIBhqCp3R87EF5pUBUKQUeK1NZVuMn7qp+mTLZgMWQwX5kX+f7ExsVCn9JH/z3nT
         cGZndQU0D/0+DTxky04YgXlyVYwsGr0jjPaC7BSc0zrAPLo2xvpfy6mY2Ub+qOHkE7TV
         gpAHtowv6R+kyIzLtA/Hhhx04TzWyzQmkF20u0uk65v86AHA6LDPPZX+kcZ/9LlUBt0i
         1Vpg==
X-Gm-Message-State: APjAAAXgNBGDyOh24bj0kUe0lGb1pRFVvg+XI9phFMw4nCe0+fNjh3pl
	FVJAe6o2QfqL8RWF/1BLnhqVMw==
X-Google-Smtp-Source: APXvYqwMG5sMpOYUYlmdi9l1EABnY1isbi9AYVyyRC9q0bSf5BiXZwS6l283nd7BU2cIJIOX0y6iFA==
X-Received: by 2002:a1c:9ec9:: with SMTP id h192mr5369086wme.105.1567615060788;
        Wed, 04 Sep 2019 09:37:40 -0700 (PDT)
Return-Path: <leif.lindholm@linaro.org>
Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2])
        by smtp.gmail.com with ESMTPSA id w13sm47084206wre.44.2019.09.04.09.37.39
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Wed, 04 Sep 2019 09:37:40 -0700 (PDT)
Date: Wed, 4 Sep 2019 17:37:38 +0100
From: "Leif Lindholm" <leif.lindholm@linaro.org>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: devel@edk2.groups.io, jaben.carsey@intel.com, ray.ni@intel.com,
	zhichao.gao@intel.com, liming.gao@intel.com
Subject: Re: [PATCH] ShellPkg/ShellPkg.dsc AARCH64: enable stack protector
Message-ID: <20190904163738.GN29255@bivouac.eciton.net>
References: <20190904163434.16836-1-ard.biesheuvel@linaro.org>
MIME-Version: 1.0
In-Reply-To: <20190904163434.16836-1-ard.biesheuvel@linaro.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Sep 04, 2019 at 09:34:34AM -0700, Ard Biesheuvel wrote:
> 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 <ard.biesheuvel@linaro.org>

Surprised we hadn't triggered this earlier.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---
>  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
>