From: jwang36 Date: Wed, 1 Aug 2007 08:45:32 +0000 (+0000) Subject: 1. Generated new build.exe from new tools code X-Git-Tag: edk2-stable201903~22441 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=6b4fe92ad93add81c3adec79f1624816e397f672 1. Generated new build.exe from new tools code 2. Removed some duplicated includes in source files 3. Changed the source file format in INF files 4. Removed duplicated PCDs in MdePkg.dec git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3520 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe index 4a25a6a582..a0bd37e884 100755 Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ diff --git a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h index cd7fe979cb..ac7cd30828 100644 --- a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h +++ b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h @@ -29,8 +29,6 @@ #define EFI_PROCESSOR_SUBCLASS_VERSION 0x00010000 -#include - #pragma pack(1) typedef struct _USB_PORT_DEVICE_PATH { diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h index 1eb477eb26..5cb20f2823 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h @@ -38,7 +38,6 @@ Abstract: #include #include #include -#include #include #define VARIABLE_RECLAIM_THRESHOLD (1024) diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf index 17cb764d09..3517e8d1ea 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -66,198 +66,198 @@ BaseLibInternals.h [Sources.Ia32] - Ia32/Wbinvd.c || MSFT ||| - Ia32/WriteMm7.c || MSFT ||| - Ia32/WriteMm6.c || MSFT ||| - Ia32/WriteMm5.c || MSFT ||| - Ia32/WriteMm4.c || MSFT ||| - Ia32/WriteMm3.c || MSFT ||| - Ia32/WriteMm2.c || MSFT ||| - Ia32/WriteMm1.c || MSFT ||| - Ia32/WriteMm0.c || MSFT ||| - Ia32/WriteLdtr.c || MSFT ||| - Ia32/WriteIdtr.c || MSFT ||| - Ia32/WriteGdtr.c || MSFT ||| - Ia32/WriteDr7.c || MSFT ||| - Ia32/WriteDr6.c || MSFT ||| - Ia32/WriteDr5.c || MSFT ||| - Ia32/WriteDr4.c || MSFT ||| - Ia32/WriteDr3.c || MSFT ||| - Ia32/WriteDr2.c || MSFT ||| - Ia32/WriteDr1.c || MSFT ||| - Ia32/WriteDr0.c || MSFT ||| - Ia32/WriteCr4.c || MSFT ||| - Ia32/WriteCr3.c || MSFT ||| - Ia32/WriteCr2.c || MSFT ||| - Ia32/WriteCr0.c || MSFT ||| - Ia32/WriteMsr64.c || MSFT ||| + Ia32/Wbinvd.c | MSFT + Ia32/WriteMm7.c | MSFT + Ia32/WriteMm6.c | MSFT + Ia32/WriteMm5.c | MSFT + Ia32/WriteMm4.c | MSFT + Ia32/WriteMm3.c | MSFT + Ia32/WriteMm2.c | MSFT + Ia32/WriteMm1.c | MSFT + Ia32/WriteMm0.c | MSFT + Ia32/WriteLdtr.c | MSFT + Ia32/WriteIdtr.c | MSFT + Ia32/WriteGdtr.c | MSFT + Ia32/WriteDr7.c | MSFT + Ia32/WriteDr6.c | MSFT + Ia32/WriteDr5.c | MSFT + Ia32/WriteDr4.c | MSFT + Ia32/WriteDr3.c | MSFT + Ia32/WriteDr2.c | MSFT + Ia32/WriteDr1.c | MSFT + Ia32/WriteDr0.c | MSFT + Ia32/WriteCr4.c | MSFT + Ia32/WriteCr3.c | MSFT + Ia32/WriteCr2.c | MSFT + Ia32/WriteCr0.c | MSFT + Ia32/WriteMsr64.c | MSFT Ia32/Thunk16.asm - Ia32/SwapBytes64.c || MSFT ||| - Ia32/SetJump.c || MSFT ||| - Ia32/RRotU64.c || MSFT ||| - Ia32/RShiftU64.c || MSFT ||| - Ia32/ReadPmc.c || MSFT ||| - Ia32/ReadTsc.c || MSFT ||| - Ia32/ReadLdtr.c || MSFT ||| - Ia32/ReadIdtr.c || MSFT ||| - Ia32/ReadGdtr.c || MSFT ||| - Ia32/ReadTr.c || MSFT ||| - Ia32/ReadSs.c || MSFT ||| - Ia32/ReadGs.c || MSFT ||| - Ia32/ReadFs.c || MSFT ||| - Ia32/ReadEs.c || MSFT ||| - Ia32/ReadDs.c || MSFT ||| - Ia32/ReadCs.c || MSFT ||| - Ia32/ReadMsr64.c || MSFT ||| - Ia32/ReadMm7.c || MSFT ||| - Ia32/ReadMm6.c || MSFT ||| - Ia32/ReadMm5.c || MSFT ||| - Ia32/ReadMm4.c || MSFT ||| - Ia32/ReadMm3.c || MSFT ||| - Ia32/ReadMm2.c || MSFT ||| - Ia32/ReadMm1.c || MSFT ||| - Ia32/ReadMm0.c || MSFT ||| - Ia32/ReadEflags.c || MSFT ||| - Ia32/ReadDr7.c || MSFT ||| - Ia32/ReadDr6.c || MSFT ||| - Ia32/ReadDr5.c || MSFT ||| - Ia32/ReadDr4.c || MSFT ||| - Ia32/ReadDr3.c || MSFT ||| - Ia32/ReadDr2.c || MSFT ||| - Ia32/ReadDr1.c || MSFT ||| - Ia32/ReadDr0.c || MSFT ||| - Ia32/ReadCr4.c || MSFT ||| - Ia32/ReadCr3.c || MSFT ||| - Ia32/ReadCr2.c || MSFT ||| - Ia32/ReadCr0.c || MSFT ||| - Ia32/Mwait.c || MSFT ||| - Ia32/Monitor.c || MSFT ||| - Ia32/ModU64x32.c || MSFT ||| - Ia32/MultU64x64.c || MSFT ||| - Ia32/MultU64x32.c || MSFT ||| - Ia32/LShiftU64.c || MSFT ||| - Ia32/LRotU64.c || MSFT ||| - Ia32/LongJump.c || MSFT ||| - Ia32/Invd.c || MSFT ||| - Ia32/InterlockedCompareExchange64.c || MSFT ||| - Ia32/InterlockedCompareExchange32.c || MSFT ||| - Ia32/InterlockedDecrement.c || MSFT ||| - Ia32/InterlockedIncrement.c || MSFT ||| - Ia32/FxRestore.c || MSFT ||| - Ia32/FxSave.c || MSFT ||| - Ia32/FlushCacheLine.c || MSFT ||| + Ia32/SwapBytes64.c | MSFT + Ia32/SetJump.c | MSFT + Ia32/RRotU64.c | MSFT + Ia32/RShiftU64.c | MSFT + Ia32/ReadPmc.c | MSFT + Ia32/ReadTsc.c | MSFT + Ia32/ReadLdtr.c | MSFT + Ia32/ReadIdtr.c | MSFT + Ia32/ReadGdtr.c | MSFT + Ia32/ReadTr.c | MSFT + Ia32/ReadSs.c | MSFT + Ia32/ReadGs.c | MSFT + Ia32/ReadFs.c | MSFT + Ia32/ReadEs.c | MSFT + Ia32/ReadDs.c | MSFT + Ia32/ReadCs.c | MSFT + Ia32/ReadMsr64.c | MSFT + Ia32/ReadMm7.c | MSFT + Ia32/ReadMm6.c | MSFT + Ia32/ReadMm5.c | MSFT + Ia32/ReadMm4.c | MSFT + Ia32/ReadMm3.c | MSFT + Ia32/ReadMm2.c | MSFT + Ia32/ReadMm1.c | MSFT + Ia32/ReadMm0.c | MSFT + Ia32/ReadEflags.c | MSFT + Ia32/ReadDr7.c | MSFT + Ia32/ReadDr6.c | MSFT + Ia32/ReadDr5.c | MSFT + Ia32/ReadDr4.c | MSFT + Ia32/ReadDr3.c | MSFT + Ia32/ReadDr2.c | MSFT + Ia32/ReadDr1.c | MSFT + Ia32/ReadDr0.c | MSFT + Ia32/ReadCr4.c | MSFT + Ia32/ReadCr3.c | MSFT + Ia32/ReadCr2.c | MSFT + Ia32/ReadCr0.c | MSFT + Ia32/Mwait.c | MSFT + Ia32/Monitor.c | MSFT + Ia32/ModU64x32.c | MSFT + Ia32/MultU64x64.c | MSFT + Ia32/MultU64x32.c | MSFT + Ia32/LShiftU64.c | MSFT + Ia32/LRotU64.c | MSFT + Ia32/LongJump.c | MSFT + Ia32/Invd.c | MSFT + Ia32/InterlockedCompareExchange64.c | MSFT + Ia32/InterlockedCompareExchange32.c | MSFT + Ia32/InterlockedDecrement.c | MSFT + Ia32/InterlockedIncrement.c | MSFT + Ia32/FxRestore.c | MSFT + Ia32/FxSave.c | MSFT + Ia32/FlushCacheLine.c | MSFT Ia32/EnablePaging64.asm - Ia32/EnablePaging32.c || MSFT ||| - Ia32/EnableInterrupts.c || MSFT ||| - Ia32/EnableDisableInterrupts.c || MSFT ||| - Ia32/DivU64x64Remainder.c || MSFT ||| - Ia32/DivU64x32Remainder.c || MSFT ||| - Ia32/DivU64x32.c || MSFT ||| - Ia32/DisablePaging32.c || MSFT ||| - Ia32/DisableInterrupts.c || MSFT ||| - Ia32/CpuPause.c || MSFT ||| - Ia32/CpuIdEx.c || MSFT ||| - Ia32/CpuId.c || MSFT ||| - Ia32/CpuSleep.c || MSFT ||| - Ia32/CpuFlushTlb.c || MSFT ||| - Ia32/CpuBreakpoint.c || MSFT ||| - Ia32/ARShiftU64.c || MSFT ||| - Ia32/Thunk16.S || GCC ||| - Ia32/CpuFlushTlb.S || GCC ||| - Ia32/CpuBreakpoint.S || GCC ||| - Ia32/CpuPause.S || GCC ||| - Ia32/CpuSleep.S || GCC ||| - Ia32/EnableDisableInterrupts.S || GCC ||| - Ia32/DisableInterrupts.S || GCC ||| - Ia32/EnableInterrupts.S || GCC ||| - Ia32/InterlockedCompareExchange64.S || GCC ||| - Ia32/InterlockedCompareExchange32.S || GCC ||| - Ia32/InterlockedDecrement.S || GCC ||| - Ia32/InterlockedIncrement.S || GCC ||| - Ia32/FlushCacheLine.S || GCC ||| - Ia32/Invd.S || GCC ||| - Ia32/Wbinvd.S || GCC ||| - Ia32/EnablePaging64.S || GCC ||| - Ia32/DisablePaging32.S || GCC ||| - Ia32/EnablePaging32.S || GCC ||| - Ia32/Mwait.S || GCC ||| - Ia32/Monitor.S || GCC ||| - Ia32/ReadPmc.S || GCC ||| - Ia32/ReadTsc.S || GCC ||| - Ia32/WriteMm7.S || GCC ||| - Ia32/WriteMm6.S || GCC ||| - Ia32/WriteMm5.S || GCC ||| - Ia32/WriteMm4.S || GCC ||| - Ia32/WriteMm3.S || GCC ||| - Ia32/WriteMm2.S || GCC ||| - Ia32/WriteMm1.S || GCC ||| - Ia32/WriteMm0.S || GCC ||| - Ia32/ReadMm7.S || GCC ||| - Ia32/ReadMm6.S || GCC ||| - Ia32/ReadMm5.S || GCC ||| - Ia32/ReadMm4.S || GCC ||| - Ia32/ReadMm3.S || GCC ||| - Ia32/ReadMm2.S || GCC ||| - Ia32/ReadMm1.S || GCC ||| - Ia32/ReadMm0.S || GCC ||| - Ia32/FxRestore.S || GCC ||| - Ia32/FxSave.S || GCC ||| - Ia32/WriteLdtr.S || GCC ||| - Ia32/ReadLdtr.S || GCC ||| - Ia32/WriteIdtr.S || GCC ||| - Ia32/ReadIdtr.S || GCC ||| - Ia32/WriteGdtr.S || GCC ||| - Ia32/ReadGdtr.S || GCC ||| - Ia32/ReadTr.S || GCC ||| - Ia32/ReadSs.S || GCC ||| - Ia32/ReadGs.S || GCC ||| - Ia32/ReadFs.S || GCC ||| - Ia32/ReadEs.S || GCC ||| - Ia32/ReadDs.S || GCC ||| - Ia32/ReadCs.S || GCC ||| - Ia32/WriteDr7.S || GCC ||| - Ia32/WriteDr6.S || GCC ||| - Ia32/WriteDr5.S || GCC ||| - Ia32/WriteDr4.S || GCC ||| - Ia32/WriteDr3.S || GCC ||| - Ia32/WriteDr2.S || GCC ||| - Ia32/WriteDr1.S || GCC ||| - Ia32/WriteDr0.S || GCC ||| - Ia32/ReadDr7.S || GCC ||| - Ia32/ReadDr6.S || GCC ||| - Ia32/ReadDr5.S || GCC ||| - Ia32/ReadDr4.S || GCC ||| - Ia32/ReadDr3.S || GCC ||| - Ia32/ReadDr2.S || GCC ||| - Ia32/ReadDr1.S || GCC ||| - Ia32/ReadDr0.S || GCC ||| - Ia32/WriteCr4.S || GCC ||| - Ia32/WriteCr3.S || GCC ||| - Ia32/WriteCr2.S || GCC ||| - Ia32/WriteCr0.S || GCC ||| - Ia32/ReadCr4.S || GCC ||| - Ia32/ReadCr3.S || GCC ||| - Ia32/ReadCr2.S || GCC ||| - Ia32/ReadCr0.S || GCC ||| - Ia32/WriteMsr64.S || GCC ||| - Ia32/ReadMsr64.S || GCC ||| - Ia32/ReadEflags.S || GCC ||| - Ia32/CpuIdEx.S || GCC ||| - Ia32/CpuId.S || GCC ||| - Ia32/LongJump.S || GCC ||| - Ia32/SetJump.S || GCC ||| - Ia32/SwapBytes64.S || GCC ||| - Ia32/DivU64x64Remainder.S || GCC ||| - Ia32/DivU64x32Remainder.S || GCC ||| - Ia32/ModU64x32.S || GCC ||| - Ia32/DivU64x32.S || GCC ||| - Ia32/MultU64x64.S || GCC ||| - Ia32/MultU64x32.S || GCC ||| - Ia32/RRotU64.S || GCC ||| - Ia32/LRotU64.S || GCC ||| - Ia32/ARShiftU64.S || GCC ||| - Ia32/RShiftU64.S || GCC ||| - Ia32/LShiftU64.S || GCC ||| + Ia32/EnablePaging32.c | MSFT + Ia32/EnableInterrupts.c | MSFT + Ia32/EnableDisableInterrupts.c | MSFT + Ia32/DivU64x64Remainder.c | MSFT + Ia32/DivU64x32Remainder.c | MSFT + Ia32/DivU64x32.c | MSFT + Ia32/DisablePaging32.c | MSFT + Ia32/DisableInterrupts.c | MSFT + Ia32/CpuPause.c | MSFT + Ia32/CpuIdEx.c | MSFT + Ia32/CpuId.c | MSFT + Ia32/CpuSleep.c | MSFT + Ia32/CpuFlushTlb.c | MSFT + Ia32/CpuBreakpoint.c | MSFT + Ia32/ARShiftU64.c | MSFT + Ia32/Thunk16.S | GCC + Ia32/CpuFlushTlb.S | GCC + Ia32/CpuBreakpoint.S | GCC + Ia32/CpuPause.S | GCC + Ia32/CpuSleep.S | GCC + Ia32/EnableDisableInterrupts.S | GCC + Ia32/DisableInterrupts.S | GCC + Ia32/EnableInterrupts.S | GCC + Ia32/InterlockedCompareExchange64.S | GCC + Ia32/InterlockedCompareExchange32.S | GCC + Ia32/InterlockedDecrement.S | GCC + Ia32/InterlockedIncrement.S | GCC + Ia32/FlushCacheLine.S | GCC + Ia32/Invd.S | GCC + Ia32/Wbinvd.S | GCC + Ia32/EnablePaging64.S | GCC + Ia32/DisablePaging32.S | GCC + Ia32/EnablePaging32.S | GCC + Ia32/Mwait.S | GCC + Ia32/Monitor.S | GCC + Ia32/ReadPmc.S | GCC + Ia32/ReadTsc.S | GCC + Ia32/WriteMm7.S | GCC + Ia32/WriteMm6.S | GCC + Ia32/WriteMm5.S | GCC + Ia32/WriteMm4.S | GCC + Ia32/WriteMm3.S | GCC + Ia32/WriteMm2.S | GCC + Ia32/WriteMm1.S | GCC + Ia32/WriteMm0.S | GCC + Ia32/ReadMm7.S | GCC + Ia32/ReadMm6.S | GCC + Ia32/ReadMm5.S | GCC + Ia32/ReadMm4.S | GCC + Ia32/ReadMm3.S | GCC + Ia32/ReadMm2.S | GCC + Ia32/ReadMm1.S | GCC + Ia32/ReadMm0.S | GCC + Ia32/FxRestore.S | GCC + Ia32/FxSave.S | GCC + Ia32/WriteLdtr.S | GCC + Ia32/ReadLdtr.S | GCC + Ia32/WriteIdtr.S | GCC + Ia32/ReadIdtr.S | GCC + Ia32/WriteGdtr.S | GCC + Ia32/ReadGdtr.S | GCC + Ia32/ReadTr.S | GCC + Ia32/ReadSs.S | GCC + Ia32/ReadGs.S | GCC + Ia32/ReadFs.S | GCC + Ia32/ReadEs.S | GCC + Ia32/ReadDs.S | GCC + Ia32/ReadCs.S | GCC + Ia32/WriteDr7.S | GCC + Ia32/WriteDr6.S | GCC + Ia32/WriteDr5.S | GCC + Ia32/WriteDr4.S | GCC + Ia32/WriteDr3.S | GCC + Ia32/WriteDr2.S | GCC + Ia32/WriteDr1.S | GCC + Ia32/WriteDr0.S | GCC + Ia32/ReadDr7.S | GCC + Ia32/ReadDr6.S | GCC + Ia32/ReadDr5.S | GCC + Ia32/ReadDr4.S | GCC + Ia32/ReadDr3.S | GCC + Ia32/ReadDr2.S | GCC + Ia32/ReadDr1.S | GCC + Ia32/ReadDr0.S | GCC + Ia32/WriteCr4.S | GCC + Ia32/WriteCr3.S | GCC + Ia32/WriteCr2.S | GCC + Ia32/WriteCr0.S | GCC + Ia32/ReadCr4.S | GCC + Ia32/ReadCr3.S | GCC + Ia32/ReadCr2.S | GCC + Ia32/ReadCr0.S | GCC + Ia32/WriteMsr64.S | GCC + Ia32/ReadMsr64.S | GCC + Ia32/ReadEflags.S | GCC + Ia32/CpuIdEx.S | GCC + Ia32/CpuId.S | GCC + Ia32/LongJump.S | GCC + Ia32/SetJump.S | GCC + Ia32/SwapBytes64.S | GCC + Ia32/DivU64x64Remainder.S | GCC + Ia32/DivU64x32Remainder.S | GCC + Ia32/ModU64x32.S | GCC + Ia32/DivU64x32.S | GCC + Ia32/MultU64x64.S | GCC + Ia32/MultU64x32.S | GCC + Ia32/RRotU64.S | GCC + Ia32/LRotU64.S | GCC + Ia32/ARShiftU64.S | GCC + Ia32/RShiftU64.S | GCC + Ia32/LShiftU64.S | GCC Ia32/DivS64x64Remainder.c Ia32/InternalSwitchStack.c Ia32/Non-existing.c @@ -276,23 +276,23 @@ x86EnablePaging32.c x86DisablePaging64.c x86DisablePaging32.c - Synchronization.c || INTEL ||| - SynchronizationMsc.c || MSFT ||| - SynchronizationGcc.c || GCC ||| + Synchronization.c | INTEL + SynchronizationMsc.c | MSFT + SynchronizationGcc.c | GCC [Sources.X64] X64/Thunk16.asm X64/CpuFlushTlb.asm - X64/CpuBreakpoint.c || MSFT ||| + X64/CpuBreakpoint.c | MSFT X64/CpuPause.asm X64/CpuSleep.asm X64/EnableDisableInterrupts.asm X64/DisableInterrupts.asm X64/EnableInterrupts.asm - X64/InterlockedCompareExchange64.asm || MSFT ||| - X64/InterlockedCompareExchange32.asm || MSFT ||| - X64/InterlockedDecrement.c || MSFT ||| - X64/InterlockedIncrement.c || MSFT ||| + X64/InterlockedCompareExchange64.asm | MSFT + X64/InterlockedCompareExchange32.asm | MSFT + X64/InterlockedDecrement.c | MSFT + X64/InterlockedIncrement.c | MSFT X64/FlushCacheLine.asm X64/Invd.asm X64/Wbinvd.asm @@ -357,8 +357,8 @@ X64/ReadCr3.asm X64/ReadCr2.asm X64/ReadCr0.asm - X64/WriteMsr64.c || MSFT ||| - X64/ReadMsr64.c || MSFT ||| + X64/WriteMsr64.c | MSFT + X64/ReadMsr64.c | MSFT X64/ReadEflags.asm X64/CpuIdEx.asm X64/CpuId.asm @@ -382,93 +382,93 @@ x86EnablePaging32.c x86DisablePaging64.c x86DisablePaging32.c - X64/WriteMsr64.S || GCC ||| - X64/WriteMm7.S || GCC ||| - X64/WriteMm6.S || GCC ||| - X64/WriteMm5.S || GCC ||| - X64/WriteMm4.S || GCC ||| - X64/WriteMm3.S || GCC ||| - X64/WriteMm2.S || GCC ||| - X64/WriteMm1.S || GCC ||| - X64/WriteMm0.S || GCC ||| - X64/WriteLdtr.S || GCC ||| - X64/WriteIdtr.S || GCC ||| - X64/WriteGdtr.S || GCC ||| - X64/WriteDr7.S || GCC ||| - X64/WriteDr6.S || GCC ||| - X64/WriteDr5.S || GCC ||| - X64/WriteDr4.S || GCC ||| - X64/WriteDr3.S || GCC ||| - X64/WriteDr2.S || GCC ||| - X64/WriteDr1.S || GCC ||| - X64/WriteDr0.S || GCC ||| - X64/WriteCr4.S || GCC ||| - X64/WriteCr3.S || GCC ||| - X64/WriteCr2.S || GCC ||| - X64/WriteCr0.S || GCC ||| - X64/Wbinvd.S || GCC ||| - X64/Thunk16.S || GCC ||| - X64/SwitchStack.S || GCC ||| - X64/SetJump.S || GCC ||| - X64/ReadTsc.S || GCC ||| - X64/ReadTr.S || GCC ||| - X64/ReadSs.S || GCC ||| - X64/ReadPmc.S || GCC ||| - X64/ReadMsr64.S || GCC ||| - X64/ReadMm7.S || GCC ||| - X64/ReadMm6.S || GCC ||| - X64/ReadMm5.S || GCC ||| - X64/ReadMm4.S || GCC ||| - X64/ReadMm3.S || GCC ||| - X64/ReadMm2.S || GCC ||| - X64/ReadMm1.S || GCC ||| - X64/ReadMm0.S || GCC ||| - X64/ReadLdtr.S || GCC ||| - X64/ReadIdtr.S || GCC ||| - X64/ReadGs.S || GCC ||| - X64/ReadGdtr.S || GCC ||| - X64/ReadFs.S || GCC ||| - X64/ReadEs.S || GCC ||| - X64/ReadEflags.S || GCC ||| - X64/ReadDs.S || GCC ||| - X64/ReadDr7.S || GCC ||| - X64/ReadDr6.S || GCC ||| - X64/ReadDr5.S || GCC ||| - X64/ReadDr4.S || GCC ||| - X64/ReadDr3.S || GCC ||| - X64/ReadDr2.S || GCC ||| - X64/ReadDr1.S || GCC ||| - X64/ReadDr0.S || GCC ||| - X64/ReadCs.S || GCC ||| - X64/ReadCr4.S || GCC ||| - X64/ReadCr3.S || GCC ||| - X64/ReadCr2.S || GCC ||| - X64/ReadCr0.S || GCC ||| - X64/Mwait.S || GCC ||| - X64/Monitor.S || GCC ||| - X64/LongJump.S || GCC ||| - X64/Invd.S || GCC ||| - X64/InterlockedIncrement.S || GCC ||| - X64/InterlockedDecrement.S || GCC ||| - X64/InterlockedCompareExchange64.S || GCC ||| - X64/InterlockedCompareExchange32.S || GCC ||| - X64/FxSave.S || GCC ||| - X64/FxRestore.S || GCC ||| - X64/FlushCacheLine.S || GCC ||| - X64/EnablePaging64.S || GCC ||| - X64/EnableInterrupts.S || GCC ||| - X64/EnableDisableInterrupts.S || GCC ||| - X64/DisablePaging64.S || GCC ||| - X64/DisableInterrupts.S || GCC ||| - X64/CpuSleep.S || GCC ||| - X64/CpuPause.S || GCC ||| - X64/CpuId.S || GCC ||| - X64/CpuIdEx.S || GCC ||| - X64/CpuFlushTlb.S || GCC ||| - X64/CpuBreakpoint.S || GCC ||| - Synchronization.c || INTEL ||| - SynchronizationMsc.c || MSFT ||| - SynchronizationGcc.c || GCC ||| + X64/WriteMsr64.S | GCC + X64/WriteMm7.S | GCC + X64/WriteMm6.S | GCC + X64/WriteMm5.S | GCC + X64/WriteMm4.S | GCC + X64/WriteMm3.S | GCC + X64/WriteMm2.S | GCC + X64/WriteMm1.S | GCC + X64/WriteMm0.S | GCC + X64/WriteLdtr.S | GCC + X64/WriteIdtr.S | GCC + X64/WriteGdtr.S | GCC + X64/WriteDr7.S | GCC + X64/WriteDr6.S | GCC + X64/WriteDr5.S | GCC + X64/WriteDr4.S | GCC + X64/WriteDr3.S | GCC + X64/WriteDr2.S | GCC + X64/WriteDr1.S | GCC + X64/WriteDr0.S | GCC + X64/WriteCr4.S | GCC + X64/WriteCr3.S | GCC + X64/WriteCr2.S | GCC + X64/WriteCr0.S | GCC + X64/Wbinvd.S | GCC + X64/Thunk16.S | GCC + X64/SwitchStack.S | GCC + X64/SetJump.S | GCC + X64/ReadTsc.S | GCC + X64/ReadTr.S | GCC + X64/ReadSs.S | GCC + X64/ReadPmc.S | GCC + X64/ReadMsr64.S | GCC + X64/ReadMm7.S | GCC + X64/ReadMm6.S | GCC + X64/ReadMm5.S | GCC + X64/ReadMm4.S | GCC + X64/ReadMm3.S | GCC + X64/ReadMm2.S | GCC + X64/ReadMm1.S | GCC + X64/ReadMm0.S | GCC + X64/ReadLdtr.S | GCC + X64/ReadIdtr.S | GCC + X64/ReadGs.S | GCC + X64/ReadGdtr.S | GCC + X64/ReadFs.S | GCC + X64/ReadEs.S | GCC + X64/ReadEflags.S | GCC + X64/ReadDs.S | GCC + X64/ReadDr7.S | GCC + X64/ReadDr6.S | GCC + X64/ReadDr5.S | GCC + X64/ReadDr4.S | GCC + X64/ReadDr3.S | GCC + X64/ReadDr2.S | GCC + X64/ReadDr1.S | GCC + X64/ReadDr0.S | GCC + X64/ReadCs.S | GCC + X64/ReadCr4.S | GCC + X64/ReadCr3.S | GCC + X64/ReadCr2.S | GCC + X64/ReadCr0.S | GCC + X64/Mwait.S | GCC + X64/Monitor.S | GCC + X64/LongJump.S | GCC + X64/Invd.S | GCC + X64/InterlockedIncrement.S | GCC + X64/InterlockedDecrement.S | GCC + X64/InterlockedCompareExchange64.S | GCC + X64/InterlockedCompareExchange32.S | GCC + X64/FxSave.S | GCC + X64/FxRestore.S | GCC + X64/FlushCacheLine.S | GCC + X64/EnablePaging64.S | GCC + X64/EnableInterrupts.S | GCC + X64/EnableDisableInterrupts.S | GCC + X64/DisablePaging64.S | GCC + X64/DisableInterrupts.S | GCC + X64/CpuSleep.S | GCC + X64/CpuPause.S | GCC + X64/CpuId.S | GCC + X64/CpuIdEx.S | GCC + X64/CpuFlushTlb.S | GCC + X64/CpuBreakpoint.S | GCC + Synchronization.c | INTEL + SynchronizationMsc.c | MSFT + SynchronizationGcc.c | GCC [Sources.IPF] Ipf/AccessGp.s @@ -498,9 +498,9 @@ Ipf/ia_64gen.h Ipf/asm.h Math64.c - Synchronization.c || INTEL ||| - SynchronizationMsc.c || MSFT ||| - SynchronizationGcc.c || GCC ||| + Synchronization.c | INTEL + SynchronizationMsc.c | MSFT + SynchronizationGcc.c | GCC [Sources.EBC] Synchronization.c diff --git a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf index 4e4e4bd4ab..ebaef9fc49 100644 --- a/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf +++ b/MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf @@ -29,13 +29,13 @@ # [Sources.Ia32] - Ia32/AsmPeiSevicesTablePointer.c||MSFT||| - Ia32/AsmPeiSevicesTablePointer.S||GCC||| + Ia32/AsmPeiSevicesTablePointer.c|MSFT + Ia32/AsmPeiSevicesTablePointer.S|GCC PeiServicesTablePointer.c [Sources.X64] - x64/AsmPeiSevicesTablePointer.asm||MSFT||| - x64/AsmPeiSevicesTablePointer.S||GCC||| + x64/AsmPeiSevicesTablePointer.asm|MSFT + x64/AsmPeiSevicesTablePointer.S|GCC PeiServicesTablePointer.c [LibraryClasses] diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 75b0e7a36a..f5e9ded4c4 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -309,11 +309,6 @@ PcdUefiVariableDefaultPlatformLangCodes|0x0000001e|gEfiMdePkgTokenSpaceGuid|VOID*|"en" PcdUefiVariableDefaultPlatformLang|0x0000001f|gEfiMdePkgTokenSpaceGuid|VOID*|"en;fr" -[PcdsFixedAtBuild.common] - PcdDebugPrintErrorLevel|0x00000006|gEfiMdePkgTokenSpaceGuid|UINT32|0x80000000 - PcdPciExpressBaseAddress|0x0000000a|gEfiMdePkgTokenSpaceGuid|UINT64|0xE0000000 - PcdFSBClock|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT32|200000000 - [PcdsFixedAtBuild.IPF] PcdIoBlockBaseAddressForIpf|0x0000000f|gEfiMdePkgTokenSpaceGuid|UINT64|0x0ffffc000000