From c614ca505dd2947acbd111e2764056aeac2012ad Mon Sep 17 00:00:00 2001
From: darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 16 Sep 2011 20:59:10 +0000
Subject: StdLib: Patches and updates for ARM.

Add ARMGCC and RVCT toolchain support.
Update and Add ARM specific machine headers.
Set the empty macro for __warn_references().
Make __flt_rounds() return 'Round to nearest' by default on ARM.

Signed-off-by:  Olivier Martin [olivier.martin@arm.com]
Reviewed-by:    darylm503


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12367 6f19259b-4bc3-4df7-8a09-765794883524
---
 StdLib/StdLib.inc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'StdLib/StdLib.inc')

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 3f16fb9da8..5446ecd35f 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -62,10 +62,19 @@
   PalLib|MdePkg/Library/UefiPalLib/UefiPalLib.inf
   TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
 
+[LibraryClasses.ARM.UEFI_APPLICATION]
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+
+
 !else
   # Use this instance if Running in an Emulation Environment.
 [LibraryClasses.Common.UEFI_APPLICATION]
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+
+[LibraryClasses.ARM.UEFI_APPLICATION]
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+
 !endif
 
 [Components]
@@ -99,9 +108,11 @@
 !ifndef $(EMULATE)
   # These Build Options are used when building the Standard Libraries to be run
   # on real hardware.
-  INTEL:*_*_*_CC_FLAGS      = /Qfreestanding
-   MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t
-    GCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib
+   INTEL:*_*_*_CC_FLAGS      = /Qfreestanding
+    MSFT:*_*_*_CC_FLAGS      = /X /Zc:wchar_t
+     GCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib
+    RVCT:*_*_*_CC_FLAGS      = --library_interface=none -J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm -DNT32dvm
+  ARMGCC:*_*_*_CC_FLAGS      = -nostdinc -nostdlib -Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length -DNT32dvm
 
 !else
   # The Build Options, below, are only used when building the Standard Libraries
@@ -112,3 +123,5 @@
    MSFT:*_*_IA32_CC_FLAGS     = /Od /D NT32dvm
     GCC:*_*_IA32_CC_FLAGS     = -O0 -DNT32dvm
 !endif
+
+
-- 
cgit v1.2.3