EFI/EDK2: Add support to compile acpidump.efi with StdLib

This patch ports acpidump EDKII build to the environment where EDKII
internal C-library StdLib is used. Shao Ming.

Signed-off-by: "Shao, Ming" <smbest163@163.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>

2 files changed, 133 insertions, 0 deletions

diff --git a/generate/efi/AcpiPkg_stdlib.dsc b/generate/efi/AcpiPkg_stdlib.dsc
new file mode 100644
index 000000000..96929e2a7
--- /dev/null
+++ b/generate/efi/AcpiPkg_stdlib.dsc
@@ -0,0 +1,68 @@
+#/** @file
+# Build discription file to generate ACPICA applications.
+#
+# Copyright (c) 2009 Intel Corporation. All rights reserved
+# This software and associated documentation (if any) is furnished
+# under a license and may only be used or copied in accordance
+# with the terms of the license. Except as permitted by such
+# license, no part of this software or documentation may be
+# reproduced, stored in a retrieval system, or transmitted in any
+# form or by any means without the express written consent of
+# Intel Corporation.
+#
+# **/
+
+[Defines]
+  PLATFORM_NAME 	  = Acpi
+  PLATFORM_GUID           = b03fdec4-2942-11e6-a416-0024e8c6d30e
+  PLATFORM_VERSION        = 1.0
+  DSC_SPECIFICATION       = 0x00010005
+  OUTPUT_DIRECTORY        = Build/Acpi
+  SUPPORTED_ARCHITECTURES = IA32|X64
+  BUILD_TARGETS           = DEBUG|RELEASE
+  SKUID_IDENTIFIER        = DEFAULT
+
+[LibraryClasses]
+  #
+  # Entry Point Libraries
+  #
+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
+  #
+  # Common Libraries
+  #
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+  DevMedia|StdLib/LibC/Uefi/Devices/daShell.inf # support new name of DevShell
+  !if $(DEBUG_ENABLE_OUTPUT)
+    DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+  !else   ## DEBUG_ENABLE_OUTPUT
+    DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  !endif  ## DEBUG_ENABLE_OUTPUT
+
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
+  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
+  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
+  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+
+!include StdLib/StdLib.inc
+
+[Components.common]
+  AcpiPkg/source/acpidump.inf
diff --git a/generate/efi/acpidump/acpidump_stdlib.inf b/generate/efi/acpidump/acpidump_stdlib.inf
new file mode 100644
index 000000000..a2ce6e47a
--- /dev/null
+++ b/generate/efi/acpidump/acpidump_stdlib.inf
@@ -0,0 +1,65 @@
+## @file
+# acpidump.inf
+#
+#  Copyright (c) 2017, Intel Corporation. All rights reserved.
+#
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution. The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = acpidump
+  FILE_GUID                      = EAB96253-B448-4855-BE7D-5A95DDECA540
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = ShellCEntryLib
+
+[Sources]
+  tools/acpidump/apdump.c
+  tools/acpidump/apfiles.c
+  tools/acpidump/apmain.c
+  common/cmfsize.c
+  common/getopt.c
+  os_specific/efi/osefitbl.c
+  os_specific/efi/osefixf.c
+  components/tables/tbprint.c
+  components/tables/tbxfroot.c
+  components/utilities/utascii.c
+  components/utilities/utbuffer.c
+  components/utilities/utdebug.c
+  components/utilities/utexcep.c
+  components/utilities/utglobal.c
+  components/utilities/uthex.c
+  components/utilities/utmath.c
+  components/utilities/utnonansi.c
+  components/utilities/utstring.c
+  components/utilities/utstrtoul64.c
+  components/utilities/utxferror.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  StdLib/StdLib.dec
+  ShellPkg/ShellPkg.dec
+  AcpiPkg/AcpiPkg.dec
+  StdLibPrivateInternalFiles/DoNotUse.dec
+
+[LibraryClasses]
+  ShellCEntryLib
+  BaseLib
+  LibC
+  DevMedia
+  UefiBootServicesTableLib
+  UefiRuntimeServicesTableLib
+
+[BuildOptions]
+  MSFT:*_*_IA32_CC_FLAGS = /WX- /D_EDK2_EFI /DACPI_DUMP_APP /DUSE_MS_ABI /DUSE_STDLIB /D__i386__
+  MSFT:*_*_X64_CC_FLAGS  = /WX- /D_EDK2_EFI /DACPI_DUMP_APP /DUSE_MS_ABI /DUSE_STDLIB /D__x86_64__
+  GCC:*_*_IA32_CC_FLAGS  = -U__linux__ -U_LINUX -D_EDK2_EFI -DACPI_DUMP_APP -DUSE_STDLIB -fno-builtin -iwithprefix include
+  GCC:*_*_X64_CC_FLAGS   = -U__linux__ -U_LINUX -D_EDK2_EFI -DACPI_DUMP_APP -DUSE_STDLIB -fno-builtin -iwithprefix include