| Message ID | 1473079066-8225-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | bc54e50e0fe03c570014f363b547426913e92449 |
| Headers | show |
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 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
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);
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> --- This makes ArmVirtQemu build again for ARM with SECURE_BOOT_ENABLE=TRUE ArmPkg/Library/CompilerIntrinsicsLib/memset.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel