Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/BaseLib.inf

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdePkg/Library/BaseLib/BaseLib.inf (modified) (9 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseLib/BaseLib.inf

@@ -2 +2 @@
 #  Base Library implementation.
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
+#  Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -18 +19 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BaseLib
+  MODULE_UNI_FILE                = BaseLib.uni
   FILE_GUID                      = 27d67720-ea68-48ae-93da-a3a074c90e30
   MODULE_TYPE                    = BASE
@@ -24 +26 @@
 
 #
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC ARM AARCH64
 #
 
@@ -60 +62 @@
   Cpu.c
   LinkedList.c
+  SafeString.c
   String.c
   BaseLibInternals.h
@@ -251 +254 @@
 
   Ia32/GccInline.c | GCC
-  Ia32/Thunk16.S | GCC 
+# VBox begin (yasm doesn't like the nasm variant) - original:
+#  Ia32/Thunk16.nasm | GCC 
+  Ia32/Thunk16.asm | GCC
+# VBox end
   Ia32/EnableDisableInterrupts.S | GCC 
   Ia32/EnablePaging64.S | GCC 
@@ -417 +423 @@
   X86DisablePaging32.c
   X64/GccInline.c | GCC
-  X64/Thunk16.S | GCC 
+# VBox begin (yasm doesn't like the nasm variant) - original:
+#  Ia32/Thunk16.nasm | GCC 
+  Ia32/Thunk16.asm | GCC
+# VBox end
   X64/SwitchStack.S | GCC 
   X64/SetJump.S | GCC 
@@ -481 +490 @@
   Arm/CpuPause.asm           | RVCT
   Arm/CpuBreakpoint.asm      | RVCT
+  Arm/MemoryFence.asm        | RVCT
  
   Arm/Math64.S                  | GCC
@@ -489 +499 @@
   Arm/SetJumpLongJump.S         | GCC
   Arm/CpuBreakpoint.S           | GCC
+  Arm/MemoryFence.S             | GCC
+
+[Sources.AARCH64]
+  Arm/InternalSwitchStack.c
+  Arm/Unaligned.c
+  Math64.c
+
+  AArch64/MemoryFence.S             | GCC
+  AArch64/SwitchStack.S             | GCC
+  AArch64/EnableInterrupts.S        | GCC
+  AArch64/DisableInterrupts.S       | GCC
+  AArch64/GetInterruptsState.S      | GCC
+  AArch64/SetJumpLongJump.S         | GCC
+  AArch64/CpuBreakpoint.S           | GCC
 
 [Packages]
@@ -499 +523 @@
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength
-  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength
-  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength
-  gEfiMdePkgTokenSpaceGuid.PcdVerifyNodeInList
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength      ## SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength     ## SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength   ## SOMETIMES_CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask            ## SOMETIMES_CONSUMES
+
+[FeaturePcd]
+  gEfiMdePkgTokenSpaceGuid.PcdVerifyNodeInList  ## CONSUMES
 
 # VBox - enable this for non-optimized IA32 builds.