To support GCC build. Currently, it could not pass GCC build,since tool could not...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3297 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/Ia32/AsmPeiSevicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibIdt/Ia32/AsmPeiSevicesTablePointer.c
index aa578ee13069824ca2c43773df61a4d49c2bc86b..d6c5bb4ad4e001034d493377998c40bed3b2c251 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/Ia32/AsmPeiSevicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/Ia32/AsmPeiSevicesTablePointer.c
@@ -12,6 +12,11 @@
 \r
 **/\r
 \r
+//\r
+// Include common header file for this module.\r
+//\r
+#include "InternalPeiServicesTablePointer.h"\r
+\r
 EFI_PEI_SERVICES **\r
 EFIAPI\r
 AsmPeiSevicesTablePointer (\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/InternalPeiServicesTablePointer.h b/MdePkg/Library/PeiServicesTablePointerLibIdt/InternalPeiServicesTablePointer.h
index a2588cb7599bac1a91503038f918c867e0f757dd..51d2d922022a653073107ce7ff42a86194103a5f 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/InternalPeiServicesTablePointer.h
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/InternalPeiServicesTablePointer.h
@@ -16,6 +16,14 @@
 #ifndef __INTERNAL_PEI_SERVICES_TABLE_POINTER_H__\r
 #define __INTERNAL_PEI_SERVICES_TABLE_POINTER_H__\r
 \r
+\r
+#include <PiPei.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/PeiServicesTablePointerLib.h>\r
+#include <Library/DebugLib.h>\r
+\r
 extern \r
 EFI_PEI_SERVICES **\r
 EFIAPI\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
index a75ddb140055f10943cebb781ec8acf7d23d1c11..6a52451381bfcaab73723968a2ab5f8428c525be 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointer.c
@@ -14,7 +14,6 @@
 \r
 #include "InternalPeiServicesTablePointer.h"\r
 \r
-\r
 /**\r
   \r
   The function returns the pointer to PeiServicee following\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
new file mode 100644 (file)
index 0000000..5f6c39a
--- /dev/null
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
@@ -0,0 +1,65 @@
+#/** @file\r
+# Component description file for IPF KR1 Pei Services Table Pointer Library\r
+#\r
+# PEI Services Table Library implementation that retrieves a pointer to the PEI\r
+#  Services Table from the KR1 register on IPF.\r
+# Copyright (c) 2006 - 2007, Intel Corporation.\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+################################################################################\r
+#\r
+# Defines Section - statements that will be processed to create a Makefile.\r
+#\r
+################################################################################\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = PeiServicesTablePointerLibIdt\r
+  FILE_GUID                      = DED3F743-CE2C-4ba6-92A2-FFCE2A6D72D9\r
+  MODULE_TYPE                    = PEIM\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = PeiServicesTablePointerLib|PEIM PEI_CORE \r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64\r
+#\r
+\r
+################################################################################\r
+#\r
+# Sources Section - list of files that are required for the build to succeed.\r
+#\r
+################################################################################\r
+[Sources.Ia32]\r
+  Ia32/AsmPeiSevicesTablePointer.c||MSFT|||\r
+  Ia32/AsmPeiSevicesTablePointer.S||GCC|||\r
+  PeiServicesTablePointer.c\r
+\r
+[Sources.X64]\r
+  x64/AsmPeiSevicesTablePointer.asm||MSFT|||\r
+  x64/AsmPeiSevicesTablePointer.S||GCC|||\r
+  PeiServicesTablePointer.c\r
+\r
+\r
+################################################################################\r
+#\r
+# Library Class Section - list of Library Classes that are required for\r
+#                         this module.\r
+#\r
+################################################################################\r
+\r
+[LibraryClasses]\r
+  DebugLib\r
+\r

diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/x64/AsmPeiSevicesTablePointer.S b/MdePkg/Library/PeiServicesTablePointerLibIdt/x64/AsmPeiSevicesTablePointer.S
index 30eccdd0b4b8d85759f25d92d4661822ce5b7fa2..66697c24bbcaec796ee1a5989d35d3ac80998036 100644 (file)
--- a/MdePkg/Library/PeiServicesTablePointerLibIdt/x64/AsmPeiSevicesTablePointer.S
+++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/x64/AsmPeiSevicesTablePointer.S
@@ -1,36 +1,36 @@
-#------------------------------------------------------------------------------
-#
-# Copyright (c) 2006, 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.
-#
-# Module Name:
-#
-#   AsmPeiSevicesTablePointer.S
-#
-# Abstract:
-#
-#   AsmPeiSevicesTablePointer function
-#
-# Notes:
-#
-#------------------------------------------------------------------------------
-
-
-#------------------------------------------------------------------------------
-# EFI_PEI_SERVICES **
-# EFIAPI
-# AsmPeiSevicesTablePointer (
-#   );
-#------------------------------------------------------------------------------
-.global AsmPeiSevicesTablePointer;
-.align 16;
-AsmPeiSevicesTablePointer:
-    sidt    (%rcx)
-    movq    -8(%rcx), %rcx
-    ret
+#------------------------------------------------------------------------------\r
+#\r
+# Copyright (c) 2006, Intel Corporation\r
+# All rights reserved. This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution.  The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+# Module Name:\r
+#\r
+#   AsmPeiSevicesTablePointer.S\r
+#\r
+# Abstract:\r
+#\r
+#   AsmPeiSevicesTablePointer function\r
+#\r
+# Notes:\r
+#\r
+#------------------------------------------------------------------------------\r
+\r
+\r
+#------------------------------------------------------------------------------\r
+# EFI_PEI_SERVICES **\r
+# EFIAPI\r
+# AsmPeiSevicesTablePointer (\r
+#   );\r
+#------------------------------------------------------------------------------\r
+.global AsmPeiSevicesTablePointer;\r
+.align 16;\r
+AsmPeiSevicesTablePointer:\r
+    sidt    (%rcx)\r
+    movq    -8(%rcx), %rcx\r
+    ret\r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index f36119fcc7ce2e902c5ef68894d0fe6d538fe749..e64c810a3c9c3023d2028540c8f6380e1814ef1a 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -132,12 +132,14 @@
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf\r
   ${WORKSPACE}/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
   ${WORKSPACE}/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r
 \r
 [Components.X64]\r
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf\r
   ${WORKSPACE}\MdePkg\Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf\r
   ${WORKSPACE}/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
   ${WORKSPACE}/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r
+  ${WORKSPACE}/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf\r
 \r
 [Components.IPF]\r
   ${WORKSPACE}/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf\r