From 88656abf1b3a690969851880ba2b134e0d144625 Mon Sep 17 00:00:00 2001 From: Scott Duplichan Date: Sun, 26 Jul 2015 08:07:20 +0000 Subject: [PATCH] StdLib: Do not define memcpy for AARCH64 builds For AARCH64, do not define a memcpy function in stdlib because it is already defined in CompilerIntrinsicsLib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Scott Duplichan Reviewed-by: Daryl McDaniel git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18063 6f19259b-4bc3-4df7-8a09-765794883524 --- StdLib/LibC/String/Copying.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/StdLib/LibC/String/Copying.c b/StdLib/LibC/String/Copying.c index e27519e24c..96be24b9a9 100644 --- a/StdLib/LibC/String/Copying.c +++ b/StdLib/LibC/String/Copying.c @@ -19,12 +19,12 @@ #include #include -/** Do not define memcpy for IPF+GCC or ARM+GCC builds. +/** Do not define memcpy for IPF+GCC or ARM/AARCH64+GCC builds. For IPF, using a GCC compiler, the memcpy function is converted to CopyMem by objcpy during build. - For ARM, the memcpy function is provided by the CompilerIntrinsics library. + For ARM/AARCH64, the memcpy function is provided by the CompilerIntrinsics library. **/ -#if !((defined(MDE_CPU_IPF) || defined(MDE_CPU_ARM)) && defined(__GNUC__)) +#if !((defined(MDE_CPU_IPF) || defined(MDE_CPU_ARM) || defined(MDE_CPU_AARCH64)) && defined(__GNUC__)) /** The memcpy function copies n characters from the object pointed to by s2 into the object pointed to by s1.