From a683ceca800e9d10c999d463444aa92945be0a70 Mon Sep 17 00:00:00 2001 From: Michael Zimmermann Date: Thu, 7 Jun 2018 07:47:20 +0200 Subject: [PATCH] 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 [ardb: change prototype of internal __memcpy() and drop extra wrapper] Reviewed-by: Ard Biesheuvel --- ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c index a944e00b89..63af04fbbc 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c +++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c @@ -15,20 +15,20 @@ 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++; - - return dest; } -__attribute__((__alias__("__memcpy"))) -void *memcpy(void *dest, const void *src, size_t n); +void *memcpy(void *dest, const void *src, size_t n) +{ + __memcpy(dest, src, n); + return dest; +} #ifdef __arm__