1 files changed, 3 insertions, 6 deletions
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
index 0d837fcecf..7271b4be6f 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
@@ -26,20 +26,17 @@ void *__memset(void *s, int c, size_t n)
   return s;
 }
 
-__attribute__((__alias__("__memset")))
-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__))
+__attribute__((__weak__, __alias__("__memset")))
 void *memset(void *dest, int c, size_t n);
 
+#ifdef __arm__
+
 void __aeabi_memset(void *dest, size_t n, int c)
 {
   __memset(dest, c, n);