StdLib/LibC: Fix ARM symbol problems

StdLibPrivateInternalFiles: Add AArch64 support

Disable 'memcpy' symbol for ARM in LibC. It is already provided by the ARM compiler intrinsics library.
Add missing 'strtold' symbol. Use the same fallback as IPF for now.
Use Include definitions as provided by ARM version.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Harry Liebel <Harry.Liebel@arm.com>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>
Reviewed-By: Daryl McDaniel <daryl.mcdaniel@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15858 6f19259b-4bc3-4df7-8a09-765794883524

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
 #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 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
 **/\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
 /** The memcpy function copies n characters from the object pointed to by s2\r
     into the object pointed to by s1.\r
 \r

diff --git a/StdLib/LibC/gdtoa/gdtoa.inf b/StdLib/LibC/gdtoa/gdtoa.inf
index fbe3ac1b63ca2a27ac36de05fbbcde36afd4581c..48b7df403fde52c4df197d6b1f7c46b0491d3012 100644 (file)
--- a/StdLib/LibC/gdtoa/gdtoa.inf
+++ b/StdLib/LibC/gdtoa/gdtoa.inf
@@ -44,6 +44,7 @@
 \r
 [Sources.ARM]\r
   strtof.c\r
 \r
 [Sources.ARM]\r
   strtof.c\r

+  Ipf/strtold.c\r

 \r
 [Sources]\r
   strtod.c      # Public interfaces\r
 \r
 [Sources]\r
   strtod.c      # Public interfaces\r

diff --git a/StdLibPrivateInternalFiles/DoNotUse.dec b/StdLibPrivateInternalFiles/DoNotUse.dec
index 1b9bdbdbe414cce1a6ed0cd98e79784ee45520e8..da6061b72075dd0de8295d836ac50936436ccd43 100644 (file)
--- a/StdLibPrivateInternalFiles/DoNotUse.dec
+++ b/StdLibPrivateInternalFiles/DoNotUse.dec
@@ -33,3 +33,7 @@
 \r
 [Includes.ARM]\r
   Include/Arm\r
 \r
 [Includes.ARM]\r
   Include/Arm\r

+\r
+[Includes.AARCH64]\r
+  # Use the ARM headers for now.\r
+  Include/Arm\r