diff options
author | Michael Zimmermann <sigmaepsilon92@gmail.com> | 2018-06-07 07:47:20 +0200 |
---|---|---|
committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-06-11 11:41:36 +0200 |
commit | a683ceca800e9d10c999d463444aa92945be0a70 (patch) | |
tree | 249af1cb00848edae8369bb0556c883b7cf346ee /ArmPkg | |
parent | 9dca2105ad960c9946d7cc2ece40f65e1999dac7 (diff) | |
download | edk2-a683ceca800e9d10c999d463444aa92945be0a70.zip edk2-a683ceca800e9d10c999d463444aa92945be0a70.tar.gz edk2-a683ceca800e9d10c999d463444aa92945be0a70.tar.bz2 |
ArmPkg/CompilerIntrinsicsLib: fix GCC8 warning for __aeabi_memcpy aliases
This was the warning (shown for __aeabi_memcpy, __aeabi_memcpy4 and
__aeabi_memcpy8):
ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c:42:6:
error: '__aeabi_memcpy8' alias between functions of incompatible types
'void(void*, const void *, size_t)'
{aka 'void(void *, const void *, unsigned int)'}
and 'void *(void *, const void *, size_t)'
{aka 'void *(void *, const void *, unsigned int)'} [-Werror=attribute-alias]
void __aeabi_memcpy8(void *dest, const void *src, size_t n);
ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c:19:7: note: aliased declaration here
void *__memcpy(void *dest, const void *src, size_t n)
The problem is the different return type (void vs void*). So reshuffle
the code so the prototypes match between the aliases.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
[ardb: change prototype of internal __memcpy() and drop extra wrapper]
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'ArmPkg')
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c index a944e00..63af04f 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c +++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c @@ -15,21 +15,21 @@ typedef __SIZE_TYPE__ size_t;
-static __attribute__((__used__))
-void *__memcpy(void *dest, const void *src, size_t n)
+static void __memcpy(void *dest, const void *src, size_t n)
{
unsigned char *d = dest;
unsigned char const *s = src;
while (n--)
*d++ = *s++;
+}
+void *memcpy(void *dest, const void *src, size_t n)
+{
+ __memcpy(dest, src, n);
return dest;
}
-__attribute__((__alias__("__memcpy")))
-void *memcpy(void *dest, const void *src, size_t n);
-
#ifdef __arm__
__attribute__((__alias__("__memcpy")))
|