public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Leif Lindholm <leif.lindholm@linaro.org>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: edk2-devel@lists.01.org
Subject: Re: [PATCH] ArmPkg/CompilerIntrinsicsLib ARM: make memset() weak again
Date: Mon, 5 Sep 2016 15:37:53 +0100	[thread overview]
Message-ID: <20160905143753.GB16080@bivouac.eciton.net> (raw)
In-Reply-To: <1473079066-8225-1-git-send-email-ard.biesheuvel@linaro.org>

On Mon, Sep 05, 2016 at 01:37:46PM +0100, Ard Biesheuvel wrote:
> After the recent update of CompilerIntrinsicsLib, our memset() is no
> longer emitted as a weak symbol. On ARM, this may cause problems when
> combining this library with another library that supplies memset() [e.g.,
> CryptoPkg/IntrinsicLib], due to the fact that the object also supplies
> the __aeabi_memXXX entry points, which can only be satisfied by this
> object. So make our memset() weak again, to let the other implementation
> take precedence.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
> 
> This makes ArmVirtQemu build again for ARM with SECURE_BOOT_ENABLE=TRUE
> 
>  ArmPkg/Library/CompilerIntrinsicsLib/memset.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
> index 3d417d797242..0d837fcecf09 100644
> --- a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
> +++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
> @@ -31,6 +31,15 @@ void *memset(void *dest, int c, size_t n);
>  
>  #ifdef __arm__
>  
> +//
> +// Other modules (such as CryptoPkg/IntrinsicLib) may provide another
> +// implementation of memset(), which may conflict with this one if this
> +// object was pulled into the link due to the definitions below. So make
> +// our memset() 'weak' to let the other implementation take precedence.
> +//
> +__attribute__((__weak__))
> +void *memset(void *dest, int c, size_t n);
> +
>  void __aeabi_memset(void *dest, size_t n, int c)
>  {
>    __memset(dest, c, n);
> -- 
> 2.7.4
> 


      reply	other threads:[~2016-09-05 14:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-05 12:37 [PATCH] ArmPkg/CompilerIntrinsicsLib ARM: make memset() weak again Ard Biesheuvel
2016-09-05 14:37 ` Leif Lindholm [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160905143753.GB16080@bivouac.eciton.net \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox