StdLib: Patches and updates for ARM.

[mirror_edk2.git] / StdLib / StdLib.inc

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