Revision: 15858
          http://sourceforge.net/p/edk2/code/15858
Author:   darylm503
Date:     2014-08-20 21:55:45 +0000 (Wed, 20 Aug 2014)
Log Message:
-----------
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 <[email protected]>
Reviewed-By: Olivier Martin <[email protected]>
Reviewed-By: Daryl McDaniel <[email protected]>

Modified Paths:
--------------
    trunk/edk2/StdLib/LibC/String/Copying.c
    trunk/edk2/StdLib/LibC/gdtoa/gdtoa.inf
    trunk/edk2/StdLibPrivateInternalFiles/DoNotUse.dec

Modified: trunk/edk2/StdLib/LibC/String/Copying.c
===================================================================
--- trunk/edk2/StdLib/LibC/String/Copying.c     2014-08-20 21:51:49 UTC (rev 
15857)
+++ trunk/edk2/StdLib/LibC/String/Copying.c     2014-08-20 21:55:45 UTC (rev 
15858)
@@ -19,11 +19,12 @@
 #include  <stdlib.h>
 #include  <string.h>
 
-/** Do not define memcpy for IPF+GCC builds.
+/** Do not define memcpy for IPF+GCC or ARM+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.
 **/
-#if  !(defined(MDE_CPU_IPF) && defined(__GNUC__))
+#if !((defined(MDE_CPU_IPF) || defined(MDE_CPU_ARM)) && defined(__GNUC__))
 /** The memcpy function copies n characters from the object pointed to by s2
     into the object pointed to by s1.
 

Modified: trunk/edk2/StdLib/LibC/gdtoa/gdtoa.inf
===================================================================
--- trunk/edk2/StdLib/LibC/gdtoa/gdtoa.inf      2014-08-20 21:51:49 UTC (rev 
15857)
+++ trunk/edk2/StdLib/LibC/gdtoa/gdtoa.inf      2014-08-20 21:55:45 UTC (rev 
15858)
@@ -44,6 +44,7 @@
 
 [Sources.ARM]
   strtof.c
+  Ipf/strtold.c
 
 [Sources]
   strtod.c      # Public interfaces

Modified: trunk/edk2/StdLibPrivateInternalFiles/DoNotUse.dec
===================================================================
--- trunk/edk2/StdLibPrivateInternalFiles/DoNotUse.dec  2014-08-20 21:51:49 UTC 
(rev 15857)
+++ trunk/edk2/StdLibPrivateInternalFiles/DoNotUse.dec  2014-08-20 21:55:45 UTC 
(rev 15858)
@@ -33,3 +33,7 @@
 
 [Includes.ARM]
   Include/Arm
+
+[Includes.AARCH64]
+  # Use the ARM headers for now.
+  Include/Arm

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to