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>

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
index a944e00b89e15be1b05580e8f822b46be3ac97ab..63af04fbbc0ade5f5ec71f9a38dcd19825274147 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
@@ -15,21 +15,21 @@
 \r
 typedef __SIZE_TYPE__ size_t;\r
 \r
-static __attribute__((__used__))\r
-void *__memcpy(void *dest, const void *src, size_t n)\r
+static void __memcpy(void *dest, const void *src, size_t n)\r
 {\r
   unsigned char *d = dest;\r
   unsigned char const *s = src;\r
 \r
   while (n--)\r
     *d++ = *s++;\r
+}\r
 \r
+void *memcpy(void *dest, const void *src, size_t n)\r
+{\r
+  __memcpy(dest, src, n);\r
   return dest;\r
 }\r
 \r
-__attribute__((__alias__("__memcpy")))\r
-void *memcpy(void *dest, const void *src, size_t n);\r
-\r
 #ifdef __arm__\r
 \r
 __attribute__((__alias__("__memcpy")))\r