StdLib/LibC: Fix ARM symbol problems

[mirror_edk2.git] / StdLib / LibC / String / Copying.c

diff --git a/StdLib/LibC/String/Copying.c b/StdLib/LibC/String/Copying.c
index 18498d6f8783c2efd9e075b99d45777de30b2d4c..e27519e24c0465902a32c8fb8cdae120c05a8ee6 100644 (file)
--- a/StdLib/LibC/String/Copying.c
+++ b/StdLib/LibC/String/Copying.c
@@ -19,11 +19,12 @@
 #include  <stdlib.h>\r
 #include  <string.h>\r
 \r
-/** Do not define memcpy for IPF+GCC builds.\r
+/** Do not define memcpy for IPF+GCC or ARM+GCC builds.\r
     For IPF, using a GCC compiler, the memcpy function is converted to\r
     CopyMem by objcpy during build.\r
+    For ARM, the memcpy function is provided by the CompilerIntrinsics library.\r
 **/\r
-#if  !(defined(MDE_CPU_IPF) && defined(__GNUC__))\r
+#if !((defined(MDE_CPU_IPF) || defined(MDE_CPU_ARM)) && defined(__GNUC__))\r
 /** The memcpy function copies n characters from the object pointed to by s2\r
     into the object pointed to by s1.\r
 \r