Moved the MdePkg to OldMdePkg so that new code in MdePkg does not break existing builds. Also updated the SPD and FPD files UiNames

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

1130 files changed, 4 insertions, 4 deletions

diff --git a/MdePkg/Include/Base.h b/OldMdePkg/Include/Base.h
index 45cbf5307f..45cbf5307f 100644
--- a/MdePkg/Include/Base.h
+++ b/OldMdePkg/Include/Base.h
diff --git a/MdePkg/Include/Common/BaseTypes.h b/OldMdePkg/Include/Common/BaseTypes.h
index f20217bf7e..f20217bf7e 100644
--- a/MdePkg/Include/Common/BaseTypes.h
+++ b/OldMdePkg/Include/Common/BaseTypes.h
diff --git a/MdePkg/Include/Common/BootMode.h b/OldMdePkg/Include/Common/BootMode.h
index 2f2c516d10..2f2c516d10 100644
--- a/MdePkg/Include/Common/BootMode.h
+++ b/OldMdePkg/Include/Common/BootMode.h
diff --git a/MdePkg/Include/Common/BootScript.h b/OldMdePkg/Include/Common/BootScript.h
index 7f7c22976d..7f7c22976d 100644
--- a/MdePkg/Include/Common/BootScript.h
+++ b/OldMdePkg/Include/Common/BootScript.h
diff --git a/MdePkg/Include/Common/Capsule.h b/OldMdePkg/Include/Common/Capsule.h
index 0434fdf7f2..0434fdf7f2 100644
--- a/MdePkg/Include/Common/Capsule.h
+++ b/OldMdePkg/Include/Common/Capsule.h
diff --git a/MdePkg/Include/Common/DataHubRecords.h b/OldMdePkg/Include/Common/DataHubRecords.h
index 9a45a63636..9a45a63636 100644
--- a/MdePkg/Include/Common/DataHubRecords.h
+++ b/OldMdePkg/Include/Common/DataHubRecords.h
diff --git a/MdePkg/Include/Common/Dependency.h b/OldMdePkg/Include/Common/Dependency.h
index b38dcd5477..b38dcd5477 100644
--- a/MdePkg/Include/Common/Dependency.h
+++ b/OldMdePkg/Include/Common/Dependency.h
diff --git a/MdePkg/Include/Common/EfiImage.h b/OldMdePkg/Include/Common/EfiImage.h
index bf53dcb586..bf53dcb586 100644
--- a/MdePkg/Include/Common/EfiImage.h
+++ b/OldMdePkg/Include/Common/EfiImage.h
diff --git a/MdePkg/Include/Common/FirmwareFileSystem.h b/OldMdePkg/Include/Common/FirmwareFileSystem.h
index 00ce8faff1..00ce8faff1 100644
--- a/MdePkg/Include/Common/FirmwareFileSystem.h
+++ b/OldMdePkg/Include/Common/FirmwareFileSystem.h
diff --git a/MdePkg/Include/Common/FirmwareVolumeHeader.h b/OldMdePkg/Include/Common/FirmwareVolumeHeader.h
index c2bbddf3e9..c2bbddf3e9 100644
--- a/MdePkg/Include/Common/FirmwareVolumeHeader.h
+++ b/OldMdePkg/Include/Common/FirmwareVolumeHeader.h
diff --git a/MdePkg/Include/Common/FirmwareVolumeImageFormat.h b/OldMdePkg/Include/Common/FirmwareVolumeImageFormat.h
index 14fa41bf26..14fa41bf26 100644
--- a/MdePkg/Include/Common/FirmwareVolumeImageFormat.h
+++ b/OldMdePkg/Include/Common/FirmwareVolumeImageFormat.h
diff --git a/MdePkg/Include/Common/Hob.h b/OldMdePkg/Include/Common/Hob.h
index b6ae6de009..b6ae6de009 100644
--- a/MdePkg/Include/Common/Hob.h
+++ b/OldMdePkg/Include/Common/Hob.h
diff --git a/MdePkg/Include/Common/InternalFormRepresentation.h b/OldMdePkg/Include/Common/InternalFormRepresentation.h
index bf3d824fbd..bf3d824fbd 100644
--- a/MdePkg/Include/Common/InternalFormRepresentation.h
+++ b/OldMdePkg/Include/Common/InternalFormRepresentation.h
diff --git a/MdePkg/Include/Common/Legacy16.h b/OldMdePkg/Include/Common/Legacy16.h
index 09bac9f035..09bac9f035 100644
--- a/MdePkg/Include/Common/Legacy16.h
+++ b/OldMdePkg/Include/Common/Legacy16.h
diff --git a/MdePkg/Include/Common/MultiPhase.h b/OldMdePkg/Include/Common/MultiPhase.h
index d9b72a4695..d9b72a4695 100644
--- a/MdePkg/Include/Common/MultiPhase.h
+++ b/OldMdePkg/Include/Common/MultiPhase.h
diff --git a/MdePkg/Include/Common/PeCoffLoaderImageContext.h b/OldMdePkg/Include/Common/PeCoffLoaderImageContext.h
index b2519ea46d..b2519ea46d 100644
--- a/MdePkg/Include/Common/PeCoffLoaderImageContext.h
+++ b/OldMdePkg/Include/Common/PeCoffLoaderImageContext.h
diff --git a/MdePkg/Include/Common/StatusCode.h b/OldMdePkg/Include/Common/StatusCode.h
index af23a0ae11..af23a0ae11 100644
--- a/MdePkg/Include/Common/StatusCode.h
+++ b/OldMdePkg/Include/Common/StatusCode.h
diff --git a/MdePkg/Include/Common/StatusCodeDataTypeId.h b/OldMdePkg/Include/Common/StatusCodeDataTypeId.h
index 49bea6122e..49bea6122e 100644
--- a/MdePkg/Include/Common/StatusCodeDataTypeId.h
+++ b/OldMdePkg/Include/Common/StatusCodeDataTypeId.h
diff --git a/MdePkg/Include/Common/UefiBaseTypes.h b/OldMdePkg/Include/Common/UefiBaseTypes.h
index f88dd4c23d..f88dd4c23d 100644
--- a/MdePkg/Include/Common/UefiBaseTypes.h
+++ b/OldMdePkg/Include/Common/UefiBaseTypes.h
diff --git a/MdePkg/Include/Dxe.h b/OldMdePkg/Include/Dxe.h
index 6c41de34d3..6c41de34d3 100644
--- a/MdePkg/Include/Dxe.h
+++ b/OldMdePkg/Include/Dxe.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Bds.h b/OldMdePkg/Include/Dxe/ArchProtocol/Bds.h
index d060eb9f57..d060eb9f57 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Bds.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Bds.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Cpu.h b/OldMdePkg/Include/Dxe/ArchProtocol/Cpu.h
index ac1b43b807..ac1b43b807 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Cpu.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Cpu.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Metronome.h b/OldMdePkg/Include/Dxe/ArchProtocol/Metronome.h
index c4a1f71925..c4a1f71925 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Metronome.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Metronome.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/MonotonicCounter.h b/OldMdePkg/Include/Dxe/ArchProtocol/MonotonicCounter.h
index d25374074d..d25374074d 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/MonotonicCounter.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/MonotonicCounter.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/RealTimeClock.h b/OldMdePkg/Include/Dxe/ArchProtocol/RealTimeClock.h
index dc968e1666..dc968e1666 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/RealTimeClock.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/RealTimeClock.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Reset.h b/OldMdePkg/Include/Dxe/ArchProtocol/Reset.h
index 80befae95f..80befae95f 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Reset.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Reset.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Runtime.h b/OldMdePkg/Include/Dxe/ArchProtocol/Runtime.h
index 1f7504a9fc..1f7504a9fc 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Runtime.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Runtime.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Security.h b/OldMdePkg/Include/Dxe/ArchProtocol/Security.h
index ec981b4a02..ec981b4a02 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Security.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Security.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/SecurityPolicy.h b/OldMdePkg/Include/Dxe/ArchProtocol/SecurityPolicy.h
index b46267e10a..b46267e10a 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/SecurityPolicy.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/SecurityPolicy.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/StatusCode.h b/OldMdePkg/Include/Dxe/ArchProtocol/StatusCode.h
index 6bfaeaedd2..6bfaeaedd2 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/StatusCode.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/StatusCode.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Timer.h b/OldMdePkg/Include/Dxe/ArchProtocol/Timer.h
index 302ae1428a..302ae1428a 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Timer.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Timer.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/Variable.h b/OldMdePkg/Include/Dxe/ArchProtocol/Variable.h
index 13eb113bcc..13eb113bcc 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/Variable.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/Variable.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/VariableWrite.h b/OldMdePkg/Include/Dxe/ArchProtocol/VariableWrite.h
index 8c21df54f1..8c21df54f1 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/VariableWrite.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/VariableWrite.h
diff --git a/MdePkg/Include/Dxe/ArchProtocol/WatchdogTimer.h b/OldMdePkg/Include/Dxe/ArchProtocol/WatchdogTimer.h
index 8e31a36bc5..8e31a36bc5 100644
--- a/MdePkg/Include/Dxe/ArchProtocol/WatchdogTimer.h
+++ b/OldMdePkg/Include/Dxe/ArchProtocol/WatchdogTimer.h
diff --git a/MdePkg/Include/Dxe/DxeCis.h b/OldMdePkg/Include/Dxe/DxeCis.h
index e1d794fffd..e1d794fffd 100644
--- a/MdePkg/Include/Dxe/DxeCis.h
+++ b/OldMdePkg/Include/Dxe/DxeCis.h
diff --git a/MdePkg/Include/Dxe/SmmCis.h b/OldMdePkg/Include/Dxe/SmmCis.h
index aeb8f110fe..aeb8f110fe 100644
--- a/MdePkg/Include/Dxe/SmmCis.h
+++ b/OldMdePkg/Include/Dxe/SmmCis.h
diff --git a/MdePkg/Include/DxeCore.h b/OldMdePkg/Include/DxeCore.h
index 77b9edc664..77b9edc664 100644
--- a/MdePkg/Include/DxeCore.h
+++ b/OldMdePkg/Include/DxeCore.h
diff --git a/MdePkg/Include/DxeDepex.h b/OldMdePkg/Include/DxeDepex.h
index e91f35083d..e91f35083d 100644
--- a/MdePkg/Include/DxeDepex.h
+++ b/OldMdePkg/Include/DxeDepex.h
diff --git a/MdePkg/Include/Ebc/ProcessorBind.h b/OldMdePkg/Include/Ebc/ProcessorBind.h
index 2cb0753867..2cb0753867 100644
--- a/MdePkg/Include/Ebc/ProcessorBind.h
+++ b/OldMdePkg/Include/Ebc/ProcessorBind.h
diff --git a/MdePkg/Include/Guid/Acpi.h b/OldMdePkg/Include/Guid/Acpi.h
index 14b2b9fcd4..14b2b9fcd4 100644
--- a/MdePkg/Include/Guid/Acpi.h
+++ b/OldMdePkg/Include/Guid/Acpi.h
diff --git a/MdePkg/Include/Guid/AcpiTableStorage.h b/OldMdePkg/Include/Guid/AcpiTableStorage.h
index 80b1154828..80b1154828 100644
--- a/MdePkg/Include/Guid/AcpiTableStorage.h
+++ b/OldMdePkg/Include/Guid/AcpiTableStorage.h
diff --git a/MdePkg/Include/Guid/Apriori.h b/OldMdePkg/Include/Guid/Apriori.h
index ba92560d7e..ba92560d7e 100644
--- a/MdePkg/Include/Guid/Apriori.h
+++ b/OldMdePkg/Include/Guid/Apriori.h
diff --git a/MdePkg/Include/Guid/Capsule.h b/OldMdePkg/Include/Guid/Capsule.h
index 7864b924de..7864b924de 100644
--- a/MdePkg/Include/Guid/Capsule.h
+++ b/OldMdePkg/Include/Guid/Capsule.h
diff --git a/MdePkg/Include/Guid/DataHubRecords.h b/OldMdePkg/Include/Guid/DataHubRecords.h
index f29a5a474f..f29a5a474f 100644
--- a/MdePkg/Include/Guid/DataHubRecords.h
+++ b/OldMdePkg/Include/Guid/DataHubRecords.h
diff --git a/MdePkg/Include/Guid/DebugImageInfoTable.h b/OldMdePkg/Include/Guid/DebugImageInfoTable.h
index 0ab4248f0f..0ab4248f0f 100644
--- a/MdePkg/Include/Guid/DebugImageInfoTable.h
+++ b/OldMdePkg/Include/Guid/DebugImageInfoTable.h
diff --git a/MdePkg/Include/Guid/DxeServices.h b/OldMdePkg/Include/Guid/DxeServices.h
index 70e4304a4b..70e4304a4b 100644
--- a/MdePkg/Include/Guid/DxeServices.h
+++ b/OldMdePkg/Include/Guid/DxeServices.h
diff --git a/MdePkg/Include/Guid/EventGroup.h b/OldMdePkg/Include/Guid/EventGroup.h
index cf681888be..cf681888be 100644
--- a/MdePkg/Include/Guid/EventGroup.h
+++ b/OldMdePkg/Include/Guid/EventGroup.h
diff --git a/MdePkg/Include/Guid/EventLegacyBios.h b/OldMdePkg/Include/Guid/EventLegacyBios.h
index d38b427d46..d38b427d46 100644
--- a/MdePkg/Include/Guid/EventLegacyBios.h
+++ b/OldMdePkg/Include/Guid/EventLegacyBios.h
diff --git a/MdePkg/Include/Guid/FileInfo.h b/OldMdePkg/Include/Guid/FileInfo.h
index 01cccf97ad..01cccf97ad 100644
--- a/MdePkg/Include/Guid/FileInfo.h
+++ b/OldMdePkg/Include/Guid/FileInfo.h
diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/OldMdePkg/Include/Guid/FileSystemInfo.h
index a890c3871c..a890c3871c 100644
--- a/MdePkg/Include/Guid/FileSystemInfo.h
+++ b/OldMdePkg/Include/Guid/FileSystemInfo.h
diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/OldMdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index 53236a616a..53236a616a 100644
--- a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
+++ b/OldMdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
diff --git a/MdePkg/Include/Guid/FirmwareFileSystem.h b/OldMdePkg/Include/Guid/FirmwareFileSystem.h
index 06bfa7d583..06bfa7d583 100644
--- a/MdePkg/Include/Guid/FirmwareFileSystem.h
+++ b/OldMdePkg/Include/Guid/FirmwareFileSystem.h
diff --git a/MdePkg/Include/Guid/FrameworkDevicePath.h b/OldMdePkg/Include/Guid/FrameworkDevicePath.h
index 74c17ea625..74c17ea625 100644
--- a/MdePkg/Include/Guid/FrameworkDevicePath.h
+++ b/OldMdePkg/Include/Guid/FrameworkDevicePath.h
diff --git a/MdePkg/Include/Guid/GlobalVariable.h b/OldMdePkg/Include/Guid/GlobalVariable.h
index 4a774a5d76..4a774a5d76 100644
--- a/MdePkg/Include/Guid/GlobalVariable.h
+++ b/OldMdePkg/Include/Guid/GlobalVariable.h
diff --git a/MdePkg/Include/Guid/Gpt.h b/OldMdePkg/Include/Guid/Gpt.h
index 7124511ac5..7124511ac5 100644
--- a/MdePkg/Include/Guid/Gpt.h
+++ b/OldMdePkg/Include/Guid/Gpt.h
diff --git a/MdePkg/Include/Guid/HobList.h b/OldMdePkg/Include/Guid/HobList.h
index 24932921fc..24932921fc 100644
--- a/MdePkg/Include/Guid/HobList.h
+++ b/OldMdePkg/Include/Guid/HobList.h
diff --git a/MdePkg/Include/Guid/MemoryAllocationHob.h b/OldMdePkg/Include/Guid/MemoryAllocationHob.h
index 140d8b8f2d..140d8b8f2d 100644
--- a/MdePkg/Include/Guid/MemoryAllocationHob.h
+++ b/OldMdePkg/Include/Guid/MemoryAllocationHob.h
diff --git a/MdePkg/Include/Guid/Mps.h b/OldMdePkg/Include/Guid/Mps.h
index 4596a3f76d..4596a3f76d 100644
--- a/MdePkg/Include/Guid/Mps.h
+++ b/OldMdePkg/Include/Guid/Mps.h
diff --git a/MdePkg/Include/Guid/PcAnsi.h b/OldMdePkg/Include/Guid/PcAnsi.h
index ea7143a64f..ea7143a64f 100644
--- a/MdePkg/Include/Guid/PcAnsi.h
+++ b/OldMdePkg/Include/Guid/PcAnsi.h
diff --git a/MdePkg/Include/Guid/SalSystemTable.h b/OldMdePkg/Include/Guid/SalSystemTable.h
index 30c830f319..30c830f319 100644
--- a/MdePkg/Include/Guid/SalSystemTable.h
+++ b/OldMdePkg/Include/Guid/SalSystemTable.h
diff --git a/MdePkg/Include/Guid/SmBios.h b/OldMdePkg/Include/Guid/SmBios.h
index f02f9fee31..f02f9fee31 100644
--- a/MdePkg/Include/Guid/SmBios.h
+++ b/OldMdePkg/Include/Guid/SmBios.h
diff --git a/MdePkg/Include/Guid/SmmCommunicate.h b/OldMdePkg/Include/Guid/SmmCommunicate.h
index 2ec200b708..2ec200b708 100644
--- a/MdePkg/Include/Guid/SmmCommunicate.h
+++ b/OldMdePkg/Include/Guid/SmmCommunicate.h
diff --git a/MdePkg/Include/Guid/SmramMemoryReserve.h b/OldMdePkg/Include/Guid/SmramMemoryReserve.h
index 392e426b1e..392e426b1e 100644
--- a/MdePkg/Include/Guid/SmramMemoryReserve.h
+++ b/OldMdePkg/Include/Guid/SmramMemoryReserve.h
diff --git a/MdePkg/Include/Guid/StatusCodeDataTypeId.h b/OldMdePkg/Include/Guid/StatusCodeDataTypeId.h
index f747af07f7..f747af07f7 100644
--- a/MdePkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/OldMdePkg/Include/Guid/StatusCodeDataTypeId.h
diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/OldMdePkg/Include/Ia32/ProcessorBind.h
index dd38e4958b..dd38e4958b 100644
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/OldMdePkg/Include/Ia32/ProcessorBind.h
diff --git a/MdePkg/Include/IndustryStandard/Acpi.h b/OldMdePkg/Include/IndustryStandard/Acpi.h
index fc8c49843d..fc8c49843d 100644
--- a/MdePkg/Include/IndustryStandard/Acpi.h
+++ b/OldMdePkg/Include/IndustryStandard/Acpi.h
diff --git a/MdePkg/Include/IndustryStandard/EfiGpt.h b/OldMdePkg/Include/IndustryStandard/EfiGpt.h
index 1026aa079b..1026aa079b 100644
--- a/MdePkg/Include/IndustryStandard/EfiGpt.h
+++ b/OldMdePkg/Include/IndustryStandard/EfiGpt.h
diff --git a/MdePkg/Include/IndustryStandard/EfiPci.h b/OldMdePkg/Include/IndustryStandard/EfiPci.h
index 7c5d4eb849..7c5d4eb849 100644
--- a/MdePkg/Include/IndustryStandard/EfiPci.h
+++ b/OldMdePkg/Include/IndustryStandard/EfiPci.h
diff --git a/MdePkg/Include/IndustryStandard/ElTorito.h b/OldMdePkg/Include/IndustryStandard/ElTorito.h
index bfa014cf87..bfa014cf87 100644
--- a/MdePkg/Include/IndustryStandard/ElTorito.h
+++ b/OldMdePkg/Include/IndustryStandard/ElTorito.h
diff --git a/MdePkg/Include/IndustryStandard/Mbr.h b/OldMdePkg/Include/IndustryStandard/Mbr.h
index 108741e7ab..108741e7ab 100644
--- a/MdePkg/Include/IndustryStandard/Mbr.h
+++ b/OldMdePkg/Include/IndustryStandard/Mbr.h
diff --git a/MdePkg/Include/IndustryStandard/SmBus.h b/OldMdePkg/Include/IndustryStandard/SmBus.h
index 41a82246cf..41a82246cf 100644
--- a/MdePkg/Include/IndustryStandard/SmBus.h
+++ b/OldMdePkg/Include/IndustryStandard/SmBus.h
diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/OldMdePkg/Include/IndustryStandard/Usb.h
index 56f94d8fc2..56f94d8fc2 100644
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/OldMdePkg/Include/IndustryStandard/Usb.h
diff --git a/MdePkg/Include/IndustryStandard/pci22.h b/OldMdePkg/Include/IndustryStandard/pci22.h
index b0ec149b50..b0ec149b50 100644
--- a/MdePkg/Include/IndustryStandard/pci22.h
+++ b/OldMdePkg/Include/IndustryStandard/pci22.h
diff --git a/MdePkg/Include/IndustryStandard/pci23.h b/OldMdePkg/Include/IndustryStandard/pci23.h
index cb0cde0725..cb0cde0725 100644
--- a/MdePkg/Include/IndustryStandard/pci23.h
+++ b/OldMdePkg/Include/IndustryStandard/pci23.h
diff --git a/MdePkg/Include/IndustryStandard/pci30.h b/OldMdePkg/Include/IndustryStandard/pci30.h
index 0272ee5399..0272ee5399 100644
--- a/MdePkg/Include/IndustryStandard/pci30.h
+++ b/OldMdePkg/Include/IndustryStandard/pci30.h
diff --git a/MdePkg/Include/IndustryStandard/scsi.h b/OldMdePkg/Include/IndustryStandard/scsi.h
index f3112ae7d0..f3112ae7d0 100644
--- a/MdePkg/Include/IndustryStandard/scsi.h
+++ b/OldMdePkg/Include/IndustryStandard/scsi.h
diff --git a/MdePkg/Include/Ipf/IpfDefines.h b/OldMdePkg/Include/Ipf/IpfDefines.h
index 4b9c1adee0..4b9c1adee0 100644
--- a/MdePkg/Include/Ipf/IpfDefines.h
+++ b/OldMdePkg/Include/Ipf/IpfDefines.h
diff --git a/MdePkg/Include/Ipf/IpfMacro.i b/OldMdePkg/Include/Ipf/IpfMacro.i
index 86fd3c1a8e..86fd3c1a8e 100644
--- a/MdePkg/Include/Ipf/IpfMacro.i
+++ b/OldMdePkg/Include/Ipf/IpfMacro.i
diff --git a/MdePkg/Include/Ipf/PalApi.h b/OldMdePkg/Include/Ipf/PalApi.h
index 0afa3d361f..0afa3d361f 100644
--- a/MdePkg/Include/Ipf/PalApi.h
+++ b/OldMdePkg/Include/Ipf/PalApi.h
diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/OldMdePkg/Include/Ipf/ProcessorBind.h
index 119b5913c4..119b5913c4 100644
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/OldMdePkg/Include/Ipf/ProcessorBind.h
diff --git a/MdePkg/Include/Ipf/SalApi.h b/OldMdePkg/Include/Ipf/SalApi.h
index 1d62705d56..1d62705d56 100644
--- a/MdePkg/Include/Ipf/SalApi.h
+++ b/OldMdePkg/Include/Ipf/SalApi.h
diff --git a/MdePkg/Include/Library/BaseLib.h b/OldMdePkg/Include/Library/BaseLib.h
index 5fbcb10d58..5fbcb10d58 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/OldMdePkg/Include/Library/BaseLib.h
diff --git a/MdePkg/Include/Library/BaseMemoryLib.h b/OldMdePkg/Include/Library/BaseMemoryLib.h
index 66051525ec..66051525ec 100644
--- a/MdePkg/Include/Library/BaseMemoryLib.h
+++ b/OldMdePkg/Include/Library/BaseMemoryLib.h
diff --git a/MdePkg/Include/Library/CacheMaintenanceLib.h b/OldMdePkg/Include/Library/CacheMaintenanceLib.h
index 91e55cf14d..91e55cf14d 100644
--- a/MdePkg/Include/Library/CacheMaintenanceLib.h
+++ b/OldMdePkg/Include/Library/CacheMaintenanceLib.h
diff --git a/MdePkg/Include/Library/CpuLib.h b/OldMdePkg/Include/Library/CpuLib.h
index 02eed1c13c..02eed1c13c 100644
--- a/MdePkg/Include/Library/CpuLib.h
+++ b/OldMdePkg/Include/Library/CpuLib.h
diff --git a/MdePkg/Include/Library/DebugLib.h b/OldMdePkg/Include/Library/DebugLib.h
index 47ac3dc4f2..47ac3dc4f2 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/OldMdePkg/Include/Library/DebugLib.h
diff --git a/MdePkg/Include/Library/DevicePathLib.h b/OldMdePkg/Include/Library/DevicePathLib.h
index aee5426ca2..aee5426ca2 100644
--- a/MdePkg/Include/Library/DevicePathLib.h
+++ b/OldMdePkg/Include/Library/DevicePathLib.h
diff --git a/MdePkg/Include/Library/DxeCoreEntryPoint.h b/OldMdePkg/Include/Library/DxeCoreEntryPoint.h
index 2317dd4844..2317dd4844 100644
--- a/MdePkg/Include/Library/DxeCoreEntryPoint.h
+++ b/OldMdePkg/Include/Library/DxeCoreEntryPoint.h
diff --git a/MdePkg/Include/Library/DxeServicesTableLib.h b/OldMdePkg/Include/Library/DxeServicesTableLib.h
index 9d3f7c888a..9d3f7c888a 100644
--- a/MdePkg/Include/Library/DxeServicesTableLib.h
+++ b/OldMdePkg/Include/Library/DxeServicesTableLib.h
diff --git a/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h b/OldMdePkg/Include/Library/DxeSmmDriverEntryPoint.h
index 12d35d5f52..12d35d5f52 100644
--- a/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h
+++ b/OldMdePkg/Include/Library/DxeSmmDriverEntryPoint.h
diff --git a/MdePkg/Include/Library/HiiLib.h b/OldMdePkg/Include/Library/HiiLib.h
index 51fde1460d..51fde1460d 100644
--- a/MdePkg/Include/Library/HiiLib.h
+++ b/OldMdePkg/Include/Library/HiiLib.h
diff --git a/MdePkg/Include/Library/HobLib.h b/OldMdePkg/Include/Library/HobLib.h
index 3b753a7af1..3b753a7af1 100644
--- a/MdePkg/Include/Library/HobLib.h
+++ b/OldMdePkg/Include/Library/HobLib.h
diff --git a/MdePkg/Include/Library/IoLib.h b/OldMdePkg/Include/Library/IoLib.h
index e86068c5f1..e86068c5f1 100644
--- a/MdePkg/Include/Library/IoLib.h
+++ b/OldMdePkg/Include/Library/IoLib.h
diff --git a/MdePkg/Include/Library/MemoryAllocationLib.h b/OldMdePkg/Include/Library/MemoryAllocationLib.h
index a2aafcfd7a..a2aafcfd7a 100644
--- a/MdePkg/Include/Library/MemoryAllocationLib.h
+++ b/OldMdePkg/Include/Library/MemoryAllocationLib.h
diff --git a/MdePkg/Include/Library/PalCallLib.h b/OldMdePkg/Include/Library/PalCallLib.h
index 8deb55a5bc..8deb55a5bc 100644
--- a/MdePkg/Include/Library/PalCallLib.h
+++ b/OldMdePkg/Include/Library/PalCallLib.h
diff --git a/MdePkg/Include/Library/PcdLib.h b/OldMdePkg/Include/Library/PcdLib.h
index 28566d9fbc..28566d9fbc 100644
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/OldMdePkg/Include/Library/PcdLib.h
diff --git a/MdePkg/Include/Library/PciCf8Lib.h b/OldMdePkg/Include/Library/PciCf8Lib.h
index 13af84ed34..13af84ed34 100644
--- a/MdePkg/Include/Library/PciCf8Lib.h
+++ b/OldMdePkg/Include/Library/PciCf8Lib.h
diff --git a/MdePkg/Include/Library/PciExpressLib.h b/OldMdePkg/Include/Library/PciExpressLib.h
index 29ff9dde82..29ff9dde82 100644
--- a/MdePkg/Include/Library/PciExpressLib.h
+++ b/OldMdePkg/Include/Library/PciExpressLib.h
diff --git a/MdePkg/Include/Library/PciLib.h b/OldMdePkg/Include/Library/PciLib.h
index 6acf13c7be..6acf13c7be 100644
--- a/MdePkg/Include/Library/PciLib.h
+++ b/OldMdePkg/Include/Library/PciLib.h
diff --git a/MdePkg/Include/Library/PciSegmentLib.h b/OldMdePkg/Include/Library/PciSegmentLib.h
index 570ae0db1a..570ae0db1a 100644
--- a/MdePkg/Include/Library/PciSegmentLib.h
+++ b/OldMdePkg/Include/Library/PciSegmentLib.h
diff --git a/MdePkg/Include/Library/PeCoffGetEntryPointLib.h b/OldMdePkg/Include/Library/PeCoffGetEntryPointLib.h
index c1bc488c8d..c1bc488c8d 100644
--- a/MdePkg/Include/Library/PeCoffGetEntryPointLib.h
+++ b/OldMdePkg/Include/Library/PeCoffGetEntryPointLib.h
diff --git a/MdePkg/Include/Library/PeCoffLib.h b/OldMdePkg/Include/Library/PeCoffLib.h
index 2bb9db58cf..2bb9db58cf 100644
--- a/MdePkg/Include/Library/PeCoffLib.h
+++ b/OldMdePkg/Include/Library/PeCoffLib.h
diff --git a/MdePkg/Include/Library/PeiCoreEntryPoint.h b/OldMdePkg/Include/Library/PeiCoreEntryPoint.h
index a096bd451b..a096bd451b 100644
--- a/MdePkg/Include/Library/PeiCoreEntryPoint.h
+++ b/OldMdePkg/Include/Library/PeiCoreEntryPoint.h
diff --git a/MdePkg/Include/Library/PeiServicesLib.h b/OldMdePkg/Include/Library/PeiServicesLib.h
index 53d1cdba42..53d1cdba42 100644
--- a/MdePkg/Include/Library/PeiServicesLib.h
+++ b/OldMdePkg/Include/Library/PeiServicesLib.h
diff --git a/MdePkg/Include/Library/PeiServicesTablePointerLib.h b/OldMdePkg/Include/Library/PeiServicesTablePointerLib.h
index 74dd321f7f..74dd321f7f 100644
--- a/MdePkg/Include/Library/PeiServicesTablePointerLib.h
+++ b/OldMdePkg/Include/Library/PeiServicesTablePointerLib.h
diff --git a/MdePkg/Include/Library/PeimEntryPoint.h b/OldMdePkg/Include/Library/PeimEntryPoint.h
index e08845926d..e08845926d 100644
--- a/MdePkg/Include/Library/PeimEntryPoint.h
+++ b/OldMdePkg/Include/Library/PeimEntryPoint.h
diff --git a/MdePkg/Include/Library/PerformanceLib.h b/OldMdePkg/Include/Library/PerformanceLib.h
index 06de00d8d8..06de00d8d8 100644
--- a/MdePkg/Include/Library/PerformanceLib.h
+++ b/OldMdePkg/Include/Library/PerformanceLib.h
diff --git a/MdePkg/Include/Library/PostCodeLib.h b/OldMdePkg/Include/Library/PostCodeLib.h
index 5a80c561df..5a80c561df 100644
--- a/MdePkg/Include/Library/PostCodeLib.h
+++ b/OldMdePkg/Include/Library/PostCodeLib.h
diff --git a/MdePkg/Include/Library/PrintLib.h b/OldMdePkg/Include/Library/PrintLib.h
index eb8a33b9c1..eb8a33b9c1 100644
--- a/MdePkg/Include/Library/PrintLib.h
+++ b/OldMdePkg/Include/Library/PrintLib.h
diff --git a/MdePkg/Include/Library/ReportStatusCodeLib.h b/OldMdePkg/Include/Library/ReportStatusCodeLib.h
index 6b32ddb137..6b32ddb137 100644
--- a/MdePkg/Include/Library/ReportStatusCodeLib.h
+++ b/OldMdePkg/Include/Library/ReportStatusCodeLib.h
diff --git a/MdePkg/Include/Library/ResourcePublicationLib.h b/OldMdePkg/Include/Library/ResourcePublicationLib.h
index ccd3eaed25..ccd3eaed25 100644
--- a/MdePkg/Include/Library/ResourcePublicationLib.h
+++ b/OldMdePkg/Include/Library/ResourcePublicationLib.h
diff --git a/MdePkg/Include/Library/SmbusLib.h b/OldMdePkg/Include/Library/SmbusLib.h
index 0520523bf1..0520523bf1 100644
--- a/MdePkg/Include/Library/SmbusLib.h
+++ b/OldMdePkg/Include/Library/SmbusLib.h
diff --git a/MdePkg/Include/Library/TimerLib.h b/OldMdePkg/Include/Library/TimerLib.h
index 8f31bbb5f3..8f31bbb5f3 100644
--- a/MdePkg/Include/Library/TimerLib.h
+++ b/OldMdePkg/Include/Library/TimerLib.h
diff --git a/MdePkg/Include/Library/UefiApplicationEntryPoint.h b/OldMdePkg/Include/Library/UefiApplicationEntryPoint.h
index ff8b5b241e..ff8b5b241e 100644
--- a/MdePkg/Include/Library/UefiApplicationEntryPoint.h
+++ b/OldMdePkg/Include/Library/UefiApplicationEntryPoint.h
diff --git a/MdePkg/Include/Library/UefiBootServicesTableLib.h b/OldMdePkg/Include/Library/UefiBootServicesTableLib.h
index df900a7ece..df900a7ece 100644
--- a/MdePkg/Include/Library/UefiBootServicesTableLib.h
+++ b/OldMdePkg/Include/Library/UefiBootServicesTableLib.h
diff --git a/MdePkg/Include/Library/UefiDecompressLib.h b/OldMdePkg/Include/Library/UefiDecompressLib.h
index d08a6eb3a0..d08a6eb3a0 100644
--- a/MdePkg/Include/Library/UefiDecompressLib.h
+++ b/OldMdePkg/Include/Library/UefiDecompressLib.h
diff --git a/MdePkg/Include/Library/UefiDriverEntryPoint.h b/OldMdePkg/Include/Library/UefiDriverEntryPoint.h
index 6269876738..6269876738 100644
--- a/MdePkg/Include/Library/UefiDriverEntryPoint.h
+++ b/OldMdePkg/Include/Library/UefiDriverEntryPoint.h
diff --git a/MdePkg/Include/Library/UefiDriverModelLib.h b/OldMdePkg/Include/Library/UefiDriverModelLib.h
index d303dfc065..d303dfc065 100644
--- a/MdePkg/Include/Library/UefiDriverModelLib.h
+++ b/OldMdePkg/Include/Library/UefiDriverModelLib.h
diff --git a/MdePkg/Include/Library/UefiLib.h b/OldMdePkg/Include/Library/UefiLib.h
index 9eaf48cace..9eaf48cace 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/OldMdePkg/Include/Library/UefiLib.h
diff --git a/MdePkg/Include/Library/UefiRuntimeLib.h b/OldMdePkg/Include/Library/UefiRuntimeLib.h
index b1d6af43da..b1d6af43da 100644
--- a/MdePkg/Include/Library/UefiRuntimeLib.h
+++ b/OldMdePkg/Include/Library/UefiRuntimeLib.h
diff --git a/MdePkg/Include/Library/UefiRuntimeServicesTableLib.h b/OldMdePkg/Include/Library/UefiRuntimeServicesTableLib.h
index 4f1ce3a1f8..4f1ce3a1f8 100644
--- a/MdePkg/Include/Library/UefiRuntimeServicesTableLib.h
+++ b/OldMdePkg/Include/Library/UefiRuntimeServicesTableLib.h
diff --git a/MdePkg/Include/PeiCore.h b/OldMdePkg/Include/PeiCore.h
index ebda687622..ebda687622 100644
--- a/MdePkg/Include/PeiCore.h
+++ b/OldMdePkg/Include/PeiCore.h
diff --git a/MdePkg/Include/Peim.h b/OldMdePkg/Include/Peim.h
index 1cf5eeff3d..1cf5eeff3d 100644
--- a/MdePkg/Include/Peim.h
+++ b/OldMdePkg/Include/Peim.h
diff --git a/MdePkg/Include/Peim/PeiCis.h b/OldMdePkg/Include/Peim/PeiCis.h
index 5bf71eb6b9..5bf71eb6b9 100644
--- a/MdePkg/Include/Peim/PeiCis.h
+++ b/OldMdePkg/Include/Peim/PeiCis.h
diff --git a/MdePkg/Include/PeimDepex.h b/OldMdePkg/Include/PeimDepex.h
index a392e505f8..a392e505f8 100644
--- a/MdePkg/Include/PeimDepex.h
+++ b/OldMdePkg/Include/PeimDepex.h
diff --git a/MdePkg/Include/PiwgDxe.h b/OldMdePkg/Include/PiwgDxe.h
index a8310bca38..a8310bca38 100644
--- a/MdePkg/Include/PiwgDxe.h
+++ b/OldMdePkg/Include/PiwgDxe.h
diff --git a/MdePkg/Include/PiwgPeim.h b/OldMdePkg/Include/PiwgPeim.h
index aaa5f5a99d..aaa5f5a99d 100644
--- a/MdePkg/Include/PiwgPeim.h
+++ b/OldMdePkg/Include/PiwgPeim.h
diff --git a/MdePkg/Include/Ppi/BlockIo.h b/OldMdePkg/Include/Ppi/BlockIo.h
index 5809c478e2..5809c478e2 100644
--- a/MdePkg/Include/Ppi/BlockIo.h
+++ b/OldMdePkg/Include/Ppi/BlockIo.h
diff --git a/MdePkg/Include/Ppi/BootInRecoveryMode.h b/OldMdePkg/Include/Ppi/BootInRecoveryMode.h
index f15d570591..f15d570591 100644
--- a/MdePkg/Include/Ppi/BootInRecoveryMode.h
+++ b/OldMdePkg/Include/Ppi/BootInRecoveryMode.h
diff --git a/MdePkg/Include/Ppi/BootScriptExecuter.h b/OldMdePkg/Include/Ppi/BootScriptExecuter.h
index 5b10292dff..5b10292dff 100644
--- a/MdePkg/Include/Ppi/BootScriptExecuter.h
+++ b/OldMdePkg/Include/Ppi/BootScriptExecuter.h
diff --git a/MdePkg/Include/Ppi/CpuIo.h b/OldMdePkg/Include/Ppi/CpuIo.h
index 791348d3f9..791348d3f9 100644
--- a/MdePkg/Include/Ppi/CpuIo.h
+++ b/OldMdePkg/Include/Ppi/CpuIo.h
diff --git a/MdePkg/Include/Ppi/DeviceRecoveryModule.h b/OldMdePkg/Include/Ppi/DeviceRecoveryModule.h
index 46c5cdeaae..46c5cdeaae 100644
--- a/MdePkg/Include/Ppi/DeviceRecoveryModule.h
+++ b/OldMdePkg/Include/Ppi/DeviceRecoveryModule.h
diff --git a/MdePkg/Include/Ppi/DxeIpl.h b/OldMdePkg/Include/Ppi/DxeIpl.h
index 3a92135651..3a92135651 100644
--- a/MdePkg/Include/Ppi/DxeIpl.h
+++ b/OldMdePkg/Include/Ppi/DxeIpl.h
diff --git a/MdePkg/Include/Ppi/EndOfPeiPhase.h b/OldMdePkg/Include/Ppi/EndOfPeiPhase.h
index e58fa03b09..e58fa03b09 100644
--- a/MdePkg/Include/Ppi/EndOfPeiPhase.h
+++ b/OldMdePkg/Include/Ppi/EndOfPeiPhase.h
diff --git a/MdePkg/Include/Ppi/FindFv.h b/OldMdePkg/Include/Ppi/FindFv.h
index 9a3e173742..9a3e173742 100644
--- a/MdePkg/Include/Ppi/FindFv.h
+++ b/OldMdePkg/Include/Ppi/FindFv.h
diff --git a/MdePkg/Include/Ppi/LoadFile.h b/OldMdePkg/Include/Ppi/LoadFile.h
index f6d8a704ee..f6d8a704ee 100644
--- a/MdePkg/Include/Ppi/LoadFile.h
+++ b/OldMdePkg/Include/Ppi/LoadFile.h
diff --git a/MdePkg/Include/Ppi/MasterBootMode.h b/OldMdePkg/Include/Ppi/MasterBootMode.h
index 010055c7fd..010055c7fd 100644
--- a/MdePkg/Include/Ppi/MasterBootMode.h
+++ b/OldMdePkg/Include/Ppi/MasterBootMode.h
diff --git a/MdePkg/Include/Ppi/MemoryDiscovered.h b/OldMdePkg/Include/Ppi/MemoryDiscovered.h
index 414926c265..414926c265 100644
--- a/MdePkg/Include/Ppi/MemoryDiscovered.h
+++ b/OldMdePkg/Include/Ppi/MemoryDiscovered.h
diff --git a/MdePkg/Include/Ppi/Pcd.h b/OldMdePkg/Include/Ppi/Pcd.h
index 38b04bfc98..38b04bfc98 100644
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/OldMdePkg/Include/Ppi/Pcd.h
diff --git a/MdePkg/Include/Ppi/PciCfg.h b/OldMdePkg/Include/Ppi/PciCfg.h
index 987f54ed43..987f54ed43 100644
--- a/MdePkg/Include/Ppi/PciCfg.h
+++ b/OldMdePkg/Include/Ppi/PciCfg.h
diff --git a/MdePkg/Include/Ppi/ReadOnlyVariable.h b/OldMdePkg/Include/Ppi/ReadOnlyVariable.h
index ee00e14147..ee00e14147 100644
--- a/MdePkg/Include/Ppi/ReadOnlyVariable.h
+++ b/OldMdePkg/Include/Ppi/ReadOnlyVariable.h
diff --git a/MdePkg/Include/Ppi/RecoveryModule.h b/OldMdePkg/Include/Ppi/RecoveryModule.h
index 8dbb951df5..8dbb951df5 100644
--- a/MdePkg/Include/Ppi/RecoveryModule.h
+++ b/OldMdePkg/Include/Ppi/RecoveryModule.h
diff --git a/MdePkg/Include/Ppi/Reset.h b/OldMdePkg/Include/Ppi/Reset.h
index be35e70d9a..be35e70d9a 100644
--- a/MdePkg/Include/Ppi/Reset.h
+++ b/OldMdePkg/Include/Ppi/Reset.h
diff --git a/MdePkg/Include/Ppi/S3Resume.h b/OldMdePkg/Include/Ppi/S3Resume.h
index c5c02595f7..c5c02595f7 100644
--- a/MdePkg/Include/Ppi/S3Resume.h
+++ b/OldMdePkg/Include/Ppi/S3Resume.h
diff --git a/MdePkg/Include/Ppi/SecPlatformInformation.h b/OldMdePkg/Include/Ppi/SecPlatformInformation.h
index bcba5dbf2a..bcba5dbf2a 100644
--- a/MdePkg/Include/Ppi/SecPlatformInformation.h
+++ b/OldMdePkg/Include/Ppi/SecPlatformInformation.h
diff --git a/MdePkg/Include/Ppi/SectionExtraction.h b/OldMdePkg/Include/Ppi/SectionExtraction.h
index fb95f6065a..fb95f6065a 100644
--- a/MdePkg/Include/Ppi/SectionExtraction.h
+++ b/OldMdePkg/Include/Ppi/SectionExtraction.h
diff --git a/MdePkg/Include/Ppi/Security.h b/OldMdePkg/Include/Ppi/Security.h
index 0be9b4a32d..0be9b4a32d 100644
--- a/MdePkg/Include/Ppi/Security.h
+++ b/OldMdePkg/Include/Ppi/Security.h
diff --git a/MdePkg/Include/Ppi/Smbus.h b/OldMdePkg/Include/Ppi/Smbus.h
index d2acae7dbd..d2acae7dbd 100644
--- a/MdePkg/Include/Ppi/Smbus.h
+++ b/OldMdePkg/Include/Ppi/Smbus.h
diff --git a/MdePkg/Include/Ppi/Stall.h b/OldMdePkg/Include/Ppi/Stall.h
index a54e7ce640..a54e7ce640 100644
--- a/MdePkg/Include/Ppi/Stall.h
+++ b/OldMdePkg/Include/Ppi/Stall.h
diff --git a/MdePkg/Include/Ppi/StatusCode.h b/OldMdePkg/Include/Ppi/StatusCode.h
index 5470222c5b..5470222c5b 100644
--- a/MdePkg/Include/Ppi/StatusCode.h
+++ b/OldMdePkg/Include/Ppi/StatusCode.h
diff --git a/MdePkg/Include/Protocol/AcpiSupport.h b/OldMdePkg/Include/Protocol/AcpiSupport.h
index 5702cb4d65..5702cb4d65 100644
--- a/MdePkg/Include/Protocol/AcpiSupport.h
+++ b/OldMdePkg/Include/Protocol/AcpiSupport.h
diff --git a/MdePkg/Include/Protocol/Arp.h b/OldMdePkg/Include/Protocol/Arp.h
index ddcc740eb4..ddcc740eb4 100644
--- a/MdePkg/Include/Protocol/Arp.h
+++ b/OldMdePkg/Include/Protocol/Arp.h
diff --git a/MdePkg/Include/Protocol/AuthenticationInfo.h b/OldMdePkg/Include/Protocol/AuthenticationInfo.h
index f80dbf362b..f80dbf362b 100644
--- a/MdePkg/Include/Protocol/AuthenticationInfo.h
+++ b/OldMdePkg/Include/Protocol/AuthenticationInfo.h
diff --git a/MdePkg/Include/Protocol/Bis.h b/OldMdePkg/Include/Protocol/Bis.h
index 37d1952c17..37d1952c17 100644
--- a/MdePkg/Include/Protocol/Bis.h
+++ b/OldMdePkg/Include/Protocol/Bis.h
diff --git a/MdePkg/Include/Protocol/BlockIo.h b/OldMdePkg/Include/Protocol/BlockIo.h
index 4c7e8b4270..4c7e8b4270 100644
--- a/MdePkg/Include/Protocol/BlockIo.h
+++ b/OldMdePkg/Include/Protocol/BlockIo.h
diff --git a/MdePkg/Include/Protocol/BootScriptSave.h b/OldMdePkg/Include/Protocol/BootScriptSave.h
index ae4d862cc4..ae4d862cc4 100644
--- a/MdePkg/Include/Protocol/BootScriptSave.h
+++ b/OldMdePkg/Include/Protocol/BootScriptSave.h
diff --git a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h b/OldMdePkg/Include/Protocol/BusSpecificDriverOverride.h
index c446940567..c446940567 100644
--- a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
+++ b/OldMdePkg/Include/Protocol/BusSpecificDriverOverride.h
diff --git a/MdePkg/Include/Protocol/ComponentName.h b/OldMdePkg/Include/Protocol/ComponentName.h
index 68fd31ba8b..68fd31ba8b 100644
--- a/MdePkg/Include/Protocol/ComponentName.h
+++ b/OldMdePkg/Include/Protocol/ComponentName.h
diff --git a/MdePkg/Include/Protocol/CpuIo.h b/OldMdePkg/Include/Protocol/CpuIo.h
index d7fce60415..d7fce60415 100644
--- a/MdePkg/Include/Protocol/CpuIo.h
+++ b/OldMdePkg/Include/Protocol/CpuIo.h
diff --git a/MdePkg/Include/Protocol/DataHub.h b/OldMdePkg/Include/Protocol/DataHub.h
index affe4b870a..affe4b870a 100644
--- a/MdePkg/Include/Protocol/DataHub.h
+++ b/OldMdePkg/Include/Protocol/DataHub.h
diff --git a/MdePkg/Include/Protocol/DebugPort.h b/OldMdePkg/Include/Protocol/DebugPort.h
index ceffaf6954..ceffaf6954 100644
--- a/MdePkg/Include/Protocol/DebugPort.h
+++ b/OldMdePkg/Include/Protocol/DebugPort.h
diff --git a/MdePkg/Include/Protocol/DebugSupport.h b/OldMdePkg/Include/Protocol/DebugSupport.h
index 8313bf5b5d..8313bf5b5d 100644
--- a/MdePkg/Include/Protocol/DebugSupport.h
+++ b/OldMdePkg/Include/Protocol/DebugSupport.h
diff --git a/MdePkg/Include/Protocol/Decompress.h b/OldMdePkg/Include/Protocol/Decompress.h
index 7c295f310e..7c295f310e 100644
--- a/MdePkg/Include/Protocol/Decompress.h
+++ b/OldMdePkg/Include/Protocol/Decompress.h
diff --git a/MdePkg/Include/Protocol/DeviceIo.h b/OldMdePkg/Include/Protocol/DeviceIo.h
index 643c810a34..643c810a34 100644
--- a/MdePkg/Include/Protocol/DeviceIo.h
+++ b/OldMdePkg/Include/Protocol/DeviceIo.h
diff --git a/MdePkg/Include/Protocol/DevicePath.h b/OldMdePkg/Include/Protocol/DevicePath.h
index d01999904f..d01999904f 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/OldMdePkg/Include/Protocol/DevicePath.h
diff --git a/MdePkg/Include/Protocol/DevicePathFromText.h b/OldMdePkg/Include/Protocol/DevicePathFromText.h
index 0d1ce3208a..0d1ce3208a 100644
--- a/MdePkg/Include/Protocol/DevicePathFromText.h
+++ b/OldMdePkg/Include/Protocol/DevicePathFromText.h
diff --git a/MdePkg/Include/Protocol/DevicePathToText.h b/OldMdePkg/Include/Protocol/DevicePathToText.h
index d888562b12..d888562b12 100644
--- a/MdePkg/Include/Protocol/DevicePathToText.h
+++ b/OldMdePkg/Include/Protocol/DevicePathToText.h
diff --git a/MdePkg/Include/Protocol/DevicePathUtilities.h b/OldMdePkg/Include/Protocol/DevicePathUtilities.h
index e72f57cf8f..e72f57cf8f 100644
--- a/MdePkg/Include/Protocol/DevicePathUtilities.h
+++ b/OldMdePkg/Include/Protocol/DevicePathUtilities.h
diff --git a/MdePkg/Include/Protocol/Dhcp4.h b/OldMdePkg/Include/Protocol/Dhcp4.h
index 3adce1a04a..3adce1a04a 100644
--- a/MdePkg/Include/Protocol/Dhcp4.h
+++ b/OldMdePkg/Include/Protocol/Dhcp4.h
diff --git a/MdePkg/Include/Protocol/DiskIo.h b/OldMdePkg/Include/Protocol/DiskIo.h
index e36792c7cd..e36792c7cd 100644
--- a/MdePkg/Include/Protocol/DiskIo.h
+++ b/OldMdePkg/Include/Protocol/DiskIo.h
diff --git a/MdePkg/Include/Protocol/DriverBinding.h b/OldMdePkg/Include/Protocol/DriverBinding.h
index 5f5d90963e..5f5d90963e 100644
--- a/MdePkg/Include/Protocol/DriverBinding.h
+++ b/OldMdePkg/Include/Protocol/DriverBinding.h
diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/OldMdePkg/Include/Protocol/DriverConfiguration.h
index f4f0c7aeb2..f4f0c7aeb2 100644
--- a/MdePkg/Include/Protocol/DriverConfiguration.h
+++ b/OldMdePkg/Include/Protocol/DriverConfiguration.h
diff --git a/MdePkg/Include/Protocol/DriverDiagnostics.h b/OldMdePkg/Include/Protocol/DriverDiagnostics.h
index c0a0cbc63b..c0a0cbc63b 100644
--- a/MdePkg/Include/Protocol/DriverDiagnostics.h
+++ b/OldMdePkg/Include/Protocol/DriverDiagnostics.h
diff --git a/MdePkg/Include/Protocol/Ebc.h b/OldMdePkg/Include/Protocol/Ebc.h
index c1abcbac5b..c1abcbac5b 100644
--- a/MdePkg/Include/Protocol/Ebc.h
+++ b/OldMdePkg/Include/Protocol/Ebc.h
diff --git a/MdePkg/Include/Protocol/EdidActive.h b/OldMdePkg/Include/Protocol/EdidActive.h
index 0562cbec36..0562cbec36 100644
--- a/MdePkg/Include/Protocol/EdidActive.h
+++ b/OldMdePkg/Include/Protocol/EdidActive.h
diff --git a/MdePkg/Include/Protocol/EdidDiscovered.h b/OldMdePkg/Include/Protocol/EdidDiscovered.h
index 6790666b67..6790666b67 100644
--- a/MdePkg/Include/Protocol/EdidDiscovered.h
+++ b/OldMdePkg/Include/Protocol/EdidDiscovered.h
diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/OldMdePkg/Include/Protocol/EdidOverride.h
index 3f4c5762e7..3f4c5762e7 100644
--- a/MdePkg/Include/Protocol/EdidOverride.h
+++ b/OldMdePkg/Include/Protocol/EdidOverride.h
diff --git a/MdePkg/Include/Protocol/EfiNetworkInterfaceIdentifier.h b/OldMdePkg/Include/Protocol/EfiNetworkInterfaceIdentifier.h
index 98f1c597a4..98f1c597a4 100644
--- a/MdePkg/Include/Protocol/EfiNetworkInterfaceIdentifier.h
+++ b/OldMdePkg/Include/Protocol/EfiNetworkInterfaceIdentifier.h
diff --git a/MdePkg/Include/Protocol/FirmwareVolume.h b/OldMdePkg/Include/Protocol/FirmwareVolume.h
index 310ea83138..310ea83138 100644
--- a/MdePkg/Include/Protocol/FirmwareVolume.h
+++ b/OldMdePkg/Include/Protocol/FirmwareVolume.h
diff --git a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h b/OldMdePkg/Include/Protocol/FirmwareVolumeBlock.h
index 0c3d03276b..0c3d03276b 100644
--- a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
+++ b/OldMdePkg/Include/Protocol/FirmwareVolumeBlock.h
diff --git a/MdePkg/Include/Protocol/FirmwareVolumeDispatch.h b/OldMdePkg/Include/Protocol/FirmwareVolumeDispatch.h
index 249a476b77..249a476b77 100644
--- a/MdePkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ b/OldMdePkg/Include/Protocol/FirmwareVolumeDispatch.h
diff --git a/MdePkg/Include/Protocol/FormBrowser.h b/OldMdePkg/Include/Protocol/FormBrowser.h
index a16331bf2c..a16331bf2c 100644
--- a/MdePkg/Include/Protocol/FormBrowser.h
+++ b/OldMdePkg/Include/Protocol/FormBrowser.h
diff --git a/MdePkg/Include/Protocol/FormCallback.h b/OldMdePkg/Include/Protocol/FormCallback.h
index 8845864be3..8845864be3 100644
--- a/MdePkg/Include/Protocol/FormCallback.h
+++ b/OldMdePkg/Include/Protocol/FormCallback.h
diff --git a/MdePkg/Include/Protocol/GraphicsOutput.h b/OldMdePkg/Include/Protocol/GraphicsOutput.h
index 1b4e1fca06..1b4e1fca06 100644
--- a/MdePkg/Include/Protocol/GraphicsOutput.h
+++ b/OldMdePkg/Include/Protocol/GraphicsOutput.h
diff --git a/MdePkg/Include/Protocol/GuidedSectionExtraction.h b/OldMdePkg/Include/Protocol/GuidedSectionExtraction.h
index 8368e281a8..8368e281a8 100644
--- a/MdePkg/Include/Protocol/GuidedSectionExtraction.h
+++ b/OldMdePkg/Include/Protocol/GuidedSectionExtraction.h
diff --git a/MdePkg/Include/Protocol/Hash.h b/OldMdePkg/Include/Protocol/Hash.h
index 9355da4fff..9355da4fff 100644
--- a/MdePkg/Include/Protocol/Hash.h
+++ b/OldMdePkg/Include/Protocol/Hash.h
diff --git a/MdePkg/Include/Protocol/Hii.h b/OldMdePkg/Include/Protocol/Hii.h
index 1fa0a2618c..1fa0a2618c 100644
--- a/MdePkg/Include/Protocol/Hii.h
+++ b/OldMdePkg/Include/Protocol/Hii.h
diff --git a/MdePkg/Include/Protocol/IP4.h b/OldMdePkg/Include/Protocol/IP4.h
index 571c534a5a..571c534a5a 100644
--- a/MdePkg/Include/Protocol/IP4.h
+++ b/OldMdePkg/Include/Protocol/IP4.h
diff --git a/MdePkg/Include/Protocol/IP4Config.h b/OldMdePkg/Include/Protocol/IP4Config.h
index 0212f35e81..0212f35e81 100644
--- a/MdePkg/Include/Protocol/IP4Config.h
+++ b/OldMdePkg/Include/Protocol/IP4Config.h
diff --git a/MdePkg/Include/Protocol/IScsiInitatorName.h b/OldMdePkg/Include/Protocol/IScsiInitatorName.h
index 1481cd2bcb..1481cd2bcb 100644
--- a/MdePkg/Include/Protocol/IScsiInitatorName.h
+++ b/OldMdePkg/Include/Protocol/IScsiInitatorName.h
diff --git a/MdePkg/Include/Protocol/IdeControllerInit.h b/OldMdePkg/Include/Protocol/IdeControllerInit.h
index d43ee0baf9..d43ee0baf9 100644
--- a/MdePkg/Include/Protocol/IdeControllerInit.h
+++ b/OldMdePkg/Include/Protocol/IdeControllerInit.h
diff --git a/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/OldMdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h
index 7357212664..7357212664 100644
--- a/MdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/OldMdePkg/Include/Protocol/IncompatiblePciDeviceSupport.h
diff --git a/MdePkg/Include/Protocol/Legacy8259.h b/OldMdePkg/Include/Protocol/Legacy8259.h
index 6be8f89d5b..6be8f89d5b 100644
--- a/MdePkg/Include/Protocol/Legacy8259.h
+++ b/OldMdePkg/Include/Protocol/Legacy8259.h
diff --git a/MdePkg/Include/Protocol/LegacyBios.h b/OldMdePkg/Include/Protocol/LegacyBios.h
index 36f8a22697..36f8a22697 100644
--- a/MdePkg/Include/Protocol/LegacyBios.h
+++ b/OldMdePkg/Include/Protocol/LegacyBios.h
diff --git a/MdePkg/Include/Protocol/LegacyBiosPlatform.h b/OldMdePkg/Include/Protocol/LegacyBiosPlatform.h
index 8c394f2ea5..8c394f2ea5 100644
--- a/MdePkg/Include/Protocol/LegacyBiosPlatform.h
+++ b/OldMdePkg/Include/Protocol/LegacyBiosPlatform.h
diff --git a/MdePkg/Include/Protocol/LegacyInterrupt.h b/OldMdePkg/Include/Protocol/LegacyInterrupt.h
index 9f69808bd7..9f69808bd7 100644
--- a/MdePkg/Include/Protocol/LegacyInterrupt.h
+++ b/OldMdePkg/Include/Protocol/LegacyInterrupt.h
diff --git a/MdePkg/Include/Protocol/LegacyRegion.h b/OldMdePkg/Include/Protocol/LegacyRegion.h
index e7e24ad3a5..e7e24ad3a5 100644
--- a/MdePkg/Include/Protocol/LegacyRegion.h
+++ b/OldMdePkg/Include/Protocol/LegacyRegion.h
diff --git a/MdePkg/Include/Protocol/LoadFile.h b/OldMdePkg/Include/Protocol/LoadFile.h
index 346039fb61..346039fb61 100644
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/OldMdePkg/Include/Protocol/LoadFile.h
diff --git a/MdePkg/Include/Protocol/LoadedImage.h b/OldMdePkg/Include/Protocol/LoadedImage.h
index aee063c927..aee063c927 100644
--- a/MdePkg/Include/Protocol/LoadedImage.h
+++ b/OldMdePkg/Include/Protocol/LoadedImage.h
diff --git a/MdePkg/Include/Protocol/ManagedNetwork.h b/OldMdePkg/Include/Protocol/ManagedNetwork.h
index 1bf9a1305a..1bf9a1305a 100644
--- a/MdePkg/Include/Protocol/ManagedNetwork.h
+++ b/OldMdePkg/Include/Protocol/ManagedNetwork.h
diff --git a/MdePkg/Include/Protocol/Mtftp4.h b/OldMdePkg/Include/Protocol/Mtftp4.h
index 18ae20bc4b..18ae20bc4b 100644
--- a/MdePkg/Include/Protocol/Mtftp4.h
+++ b/OldMdePkg/Include/Protocol/Mtftp4.h
diff --git a/MdePkg/Include/Protocol/Pcd.h b/OldMdePkg/Include/Protocol/Pcd.h
index 7741df17ea..7741df17ea 100644
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/OldMdePkg/Include/Protocol/Pcd.h
diff --git a/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/OldMdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h
index 147d07c8f7..147d07c8f7 100644
--- a/MdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h
+++ b/OldMdePkg/Include/Protocol/PciHostBridgeResourceAllocation.h
diff --git a/MdePkg/Include/Protocol/PciHotPlugInit.h b/OldMdePkg/Include/Protocol/PciHotPlugInit.h
index efd4c454a6..efd4c454a6 100644
--- a/MdePkg/Include/Protocol/PciHotPlugInit.h
+++ b/OldMdePkg/Include/Protocol/PciHotPlugInit.h
diff --git a/MdePkg/Include/Protocol/PciIo.h b/OldMdePkg/Include/Protocol/PciIo.h
index 147f6b2441..147f6b2441 100644
--- a/MdePkg/Include/Protocol/PciIo.h
+++ b/OldMdePkg/Include/Protocol/PciIo.h
diff --git a/MdePkg/Include/Protocol/PciPlatform.h b/OldMdePkg/Include/Protocol/PciPlatform.h
index 1c1a6c31fc..1c1a6c31fc 100644
--- a/MdePkg/Include/Protocol/PciPlatform.h
+++ b/OldMdePkg/Include/Protocol/PciPlatform.h
diff --git a/MdePkg/Include/Protocol/PciRootBridgeIo.h b/OldMdePkg/Include/Protocol/PciRootBridgeIo.h
index af3d9ed188..af3d9ed188 100644
--- a/MdePkg/Include/Protocol/PciRootBridgeIo.h
+++ b/OldMdePkg/Include/Protocol/PciRootBridgeIo.h
diff --git a/MdePkg/Include/Protocol/PlatformDriverOverride.h b/OldMdePkg/Include/Protocol/PlatformDriverOverride.h
index 1015c50d3e..1015c50d3e 100644
--- a/MdePkg/Include/Protocol/PlatformDriverOverride.h
+++ b/OldMdePkg/Include/Protocol/PlatformDriverOverride.h
diff --git a/MdePkg/Include/Protocol/PxeBaseCode.h b/OldMdePkg/Include/Protocol/PxeBaseCode.h
index 7fb2a80c42..7fb2a80c42 100644
--- a/MdePkg/Include/Protocol/PxeBaseCode.h
+++ b/OldMdePkg/Include/Protocol/PxeBaseCode.h
diff --git a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h b/OldMdePkg/Include/Protocol/PxeBaseCodeCallBack.h
index 7f16701367..7f16701367 100644
--- a/MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
+++ b/OldMdePkg/Include/Protocol/PxeBaseCodeCallBack.h
diff --git a/MdePkg/Include/Protocol/ScsiIoExt.h b/OldMdePkg/Include/Protocol/ScsiIoExt.h
index 872b60c2a9..872b60c2a9 100644
--- a/MdePkg/Include/Protocol/ScsiIoExt.h
+++ b/OldMdePkg/Include/Protocol/ScsiIoExt.h
diff --git a/MdePkg/Include/Protocol/ScsiPassThru.h b/OldMdePkg/Include/Protocol/ScsiPassThru.h
index a5aa6c47c0..a5aa6c47c0 100644
--- a/MdePkg/Include/Protocol/ScsiPassThru.h
+++ b/OldMdePkg/Include/Protocol/ScsiPassThru.h
diff --git a/MdePkg/Include/Protocol/ScsiPassThruExt.h b/OldMdePkg/Include/Protocol/ScsiPassThruExt.h
index 5d6e760d0f..5d6e760d0f 100644
--- a/MdePkg/Include/Protocol/ScsiPassThruExt.h
+++ b/OldMdePkg/Include/Protocol/ScsiPassThruExt.h
diff --git a/MdePkg/Include/Protocol/SectionExtraction.h b/OldMdePkg/Include/Protocol/SectionExtraction.h
index adc03f5985..adc03f5985 100644
--- a/MdePkg/Include/Protocol/SectionExtraction.h
+++ b/OldMdePkg/Include/Protocol/SectionExtraction.h
diff --git a/MdePkg/Include/Protocol/SerialIo.h b/OldMdePkg/Include/Protocol/SerialIo.h
index 89a73409d9..89a73409d9 100644
--- a/MdePkg/Include/Protocol/SerialIo.h
+++ b/OldMdePkg/Include/Protocol/SerialIo.h
diff --git a/MdePkg/Include/Protocol/ServiceBinding.h b/OldMdePkg/Include/Protocol/ServiceBinding.h
index 57ce92f142..57ce92f142 100644
--- a/MdePkg/Include/Protocol/ServiceBinding.h
+++ b/OldMdePkg/Include/Protocol/ServiceBinding.h
diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/OldMdePkg/Include/Protocol/SimpleFileSystem.h
index add8ad6eeb..add8ad6eeb 100644
--- a/MdePkg/Include/Protocol/SimpleFileSystem.h
+++ b/OldMdePkg/Include/Protocol/SimpleFileSystem.h
diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/OldMdePkg/Include/Protocol/SimpleNetwork.h
index 0da64bbe53..0da64bbe53 100644
--- a/MdePkg/Include/Protocol/SimpleNetwork.h
+++ b/OldMdePkg/Include/Protocol/SimpleNetwork.h
diff --git a/MdePkg/Include/Protocol/SimplePointer.h b/OldMdePkg/Include/Protocol/SimplePointer.h
index a0e0804074..a0e0804074 100644
--- a/MdePkg/Include/Protocol/SimplePointer.h
+++ b/OldMdePkg/Include/Protocol/SimplePointer.h
diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/OldMdePkg/Include/Protocol/SimpleTextIn.h
index 3e7f016f4c..3e7f016f4c 100644
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/OldMdePkg/Include/Protocol/SimpleTextIn.h
diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/OldMdePkg/Include/Protocol/SimpleTextOut.h
index b568865f18..b568865f18 100644
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/OldMdePkg/Include/Protocol/SimpleTextOut.h
diff --git a/MdePkg/Include/Protocol/Smbus.h b/OldMdePkg/Include/Protocol/Smbus.h
index b63d26fcbc..b63d26fcbc 100644
--- a/MdePkg/Include/Protocol/Smbus.h
+++ b/OldMdePkg/Include/Protocol/Smbus.h
diff --git a/MdePkg/Include/Protocol/SmmAccess.h b/OldMdePkg/Include/Protocol/SmmAccess.h
index 3f17787539..3f17787539 100644
--- a/MdePkg/Include/Protocol/SmmAccess.h
+++ b/OldMdePkg/Include/Protocol/SmmAccess.h
diff --git a/MdePkg/Include/Protocol/SmmBase.h b/OldMdePkg/Include/Protocol/SmmBase.h
index 664e34c9e6..664e34c9e6 100644
--- a/MdePkg/Include/Protocol/SmmBase.h
+++ b/OldMdePkg/Include/Protocol/SmmBase.h
diff --git a/MdePkg/Include/Protocol/SmmControl.h b/OldMdePkg/Include/Protocol/SmmControl.h
index a83d25bf85..a83d25bf85 100644
--- a/MdePkg/Include/Protocol/SmmControl.h
+++ b/OldMdePkg/Include/Protocol/SmmControl.h
diff --git a/MdePkg/Include/Protocol/SmmGpiDispatch.h b/OldMdePkg/Include/Protocol/SmmGpiDispatch.h
index 8173fe540f..8173fe540f 100644
--- a/MdePkg/Include/Protocol/SmmGpiDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmGpiDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmIchnDispatch.h b/OldMdePkg/Include/Protocol/SmmIchnDispatch.h
index a2bc84c341..a2bc84c341 100644
--- a/MdePkg/Include/Protocol/SmmIchnDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmIchnDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch.h b/OldMdePkg/Include/Protocol/SmmPeriodicTimerDispatch.h
index 75f3e80b9c..75f3e80b9c 100644
--- a/MdePkg/Include/Protocol/SmmPeriodicTimerDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmPeriodicTimerDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmPowerButtonDispatch.h b/OldMdePkg/Include/Protocol/SmmPowerButtonDispatch.h
index 891a1fd2b3..891a1fd2b3 100644
--- a/MdePkg/Include/Protocol/SmmPowerButtonDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmPowerButtonDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch.h b/OldMdePkg/Include/Protocol/SmmStandbyButtonDispatch.h
index 36f4bb606a..36f4bb606a 100644
--- a/MdePkg/Include/Protocol/SmmStandbyButtonDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmStandbyButtonDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmStatusCode.h b/OldMdePkg/Include/Protocol/SmmStatusCode.h
index 73f26d4c76..73f26d4c76 100644
--- a/MdePkg/Include/Protocol/SmmStatusCode.h
+++ b/OldMdePkg/Include/Protocol/SmmStatusCode.h
diff --git a/MdePkg/Include/Protocol/SmmSwDispatch.h b/OldMdePkg/Include/Protocol/SmmSwDispatch.h
index 2f4fecffb0..2f4fecffb0 100644
--- a/MdePkg/Include/Protocol/SmmSwDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmSwDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmSxDispatch.h b/OldMdePkg/Include/Protocol/SmmSxDispatch.h
index 43570aa425..43570aa425 100644
--- a/MdePkg/Include/Protocol/SmmSxDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmSxDispatch.h
diff --git a/MdePkg/Include/Protocol/SmmUsbDispatch.h b/OldMdePkg/Include/Protocol/SmmUsbDispatch.h
index de48f941f0..de48f941f0 100644
--- a/MdePkg/Include/Protocol/SmmUsbDispatch.h
+++ b/OldMdePkg/Include/Protocol/SmmUsbDispatch.h
diff --git a/MdePkg/Include/Protocol/TapeIo.h b/OldMdePkg/Include/Protocol/TapeIo.h
index 919c95bc70..919c95bc70 100644
--- a/MdePkg/Include/Protocol/TapeIo.h
+++ b/OldMdePkg/Include/Protocol/TapeIo.h
diff --git a/MdePkg/Include/Protocol/Tcp4.h b/OldMdePkg/Include/Protocol/Tcp4.h
index 8c22ef2096..8c22ef2096 100644
--- a/MdePkg/Include/Protocol/Tcp4.h
+++ b/OldMdePkg/Include/Protocol/Tcp4.h
diff --git a/MdePkg/Include/Protocol/Udp4.h b/OldMdePkg/Include/Protocol/Udp4.h
index 7ac3c80f6c..7ac3c80f6c 100644
--- a/MdePkg/Include/Protocol/Udp4.h
+++ b/OldMdePkg/Include/Protocol/Udp4.h
diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/OldMdePkg/Include/Protocol/UgaDraw.h
index 5586bdfffb..5586bdfffb 100644
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/OldMdePkg/Include/Protocol/UgaDraw.h
diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/OldMdePkg/Include/Protocol/UnicodeCollation.h
index e0278038f7..e0278038f7 100644
--- a/MdePkg/Include/Protocol/UnicodeCollation.h
+++ b/OldMdePkg/Include/Protocol/UnicodeCollation.h
diff --git a/MdePkg/Include/Protocol/Usb2HostController.h b/OldMdePkg/Include/Protocol/Usb2HostController.h
index 15742281b7..15742281b7 100644
--- a/MdePkg/Include/Protocol/Usb2HostController.h
+++ b/OldMdePkg/Include/Protocol/Usb2HostController.h
diff --git a/MdePkg/Include/Protocol/UsbHostController.h b/OldMdePkg/Include/Protocol/UsbHostController.h
index 20e6fccb4c..20e6fccb4c 100644
--- a/MdePkg/Include/Protocol/UsbHostController.h
+++ b/OldMdePkg/Include/Protocol/UsbHostController.h
diff --git a/MdePkg/Include/Protocol/UsbIo.h b/OldMdePkg/Include/Protocol/UsbIo.h
index 47de143d85..47de143d85 100644
--- a/MdePkg/Include/Protocol/UsbIo.h
+++ b/OldMdePkg/Include/Protocol/UsbIo.h
diff --git a/MdePkg/Include/Uefi.h b/OldMdePkg/Include/Uefi.h
index ebf93c0e1b..ebf93c0e1b 100644
--- a/MdePkg/Include/Uefi.h
+++ b/OldMdePkg/Include/Uefi.h
diff --git a/MdePkg/Include/Uefi/EfiPxe.h b/OldMdePkg/Include/Uefi/EfiPxe.h
index eadac3c850..eadac3c850 100644
--- a/MdePkg/Include/Uefi/EfiPxe.h
+++ b/OldMdePkg/Include/Uefi/EfiPxe.h
diff --git a/MdePkg/Include/Uefi/Errors.h b/OldMdePkg/Include/Uefi/Errors.h
index fd1dc02c81..fd1dc02c81 100644
--- a/MdePkg/Include/Uefi/Errors.h
+++ b/OldMdePkg/Include/Uefi/Errors.h
diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/OldMdePkg/Include/Uefi/UefiSpec.h
index 15b3ac22d2..15b3ac22d2 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/OldMdePkg/Include/Uefi/UefiSpec.h
diff --git a/MdePkg/Include/x64/ProcessorBind.h b/OldMdePkg/Include/x64/ProcessorBind.h
index 34b35a89b8..34b35a89b8 100644
--- a/MdePkg/Include/x64/ProcessorBind.h
+++ b/OldMdePkg/Include/x64/ProcessorBind.h
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa b/OldMdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
index cb156056be..cb156056be 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
+++ b/OldMdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.msa
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c b/OldMdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
index 3a0f6f2395..3a0f6f2395 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
+++ b/OldMdePkg/Library/BaseCacheMaintenanceLib/EbcCache.c
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c b/OldMdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
index 17060eb70f..17060eb70f 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
+++ b/OldMdePkg/Library/BaseCacheMaintenanceLib/IpfCache.c
diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c b/OldMdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
index 6e812c99c3..6e812c99c3 100644
--- a/MdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
+++ b/OldMdePkg/Library/BaseCacheMaintenanceLib/x86Cache.c
diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/OldMdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
index d482cf9021..d482cf9021 100644
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
+++ b/OldMdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
diff --git a/MdePkg/Library/BaseDebugLibNull/DebugLib.c b/OldMdePkg/Library/BaseDebugLibNull/DebugLib.c
index c14944b7be..c14944b7be 100644
--- a/MdePkg/Library/BaseDebugLibNull/DebugLib.c
+++ b/OldMdePkg/Library/BaseDebugLibNull/DebugLib.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa b/OldMdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
index e974647289..e974647289 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.msa
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/OldMdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index ed09b4e5aa..ed09b4e5aa 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLib.c
index 02c03b7aab..02c03b7aab 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLib.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
index 806f44bbe7..806f44bbe7 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
index 8de4f71bd0..8de4f71bd0 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
index b8e6d83665..b8e6d83665 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 2c68a3e43c..2c68a3e43c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/OldMdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
diff --git a/MdePkg/Library/BaseLib/ARShiftU64.c b/OldMdePkg/Library/BaseLib/ARShiftU64.c
index feb5430311..feb5430311 100644
--- a/MdePkg/Library/BaseLib/ARShiftU64.c
+++ b/OldMdePkg/Library/BaseLib/ARShiftU64.c
diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/OldMdePkg/Library/BaseLib/BaseLib.msa
index 2fa9ef2a22..2fa9ef2a22 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/OldMdePkg/Library/BaseLib/BaseLib.msa
diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/OldMdePkg/Library/BaseLib/BaseLibInternals.h
index 685b8ce99b..685b8ce99b 100644
--- a/MdePkg/Library/BaseLib/BaseLibInternals.h
+++ b/OldMdePkg/Library/BaseLib/BaseLibInternals.h
diff --git a/MdePkg/Library/BaseLib/BitField.c b/OldMdePkg/Library/BaseLib/BitField.c
index 3db8a23c95..3db8a23c95 100644
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/OldMdePkg/Library/BaseLib/BitField.c
diff --git a/MdePkg/Library/BaseLib/CheckSum.c b/OldMdePkg/Library/BaseLib/CheckSum.c
index e851164998..e851164998 100644
--- a/MdePkg/Library/BaseLib/CheckSum.c
+++ b/OldMdePkg/Library/BaseLib/CheckSum.c
diff --git a/MdePkg/Library/BaseLib/Cpu.c b/OldMdePkg/Library/BaseLib/Cpu.c
index cc7a608f83..cc7a608f83 100644
--- a/MdePkg/Library/BaseLib/Cpu.c
+++ b/OldMdePkg/Library/BaseLib/Cpu.c
diff --git a/MdePkg/Library/BaseLib/CpuDeadLoop.c b/OldMdePkg/Library/BaseLib/CpuDeadLoop.c
index f8f530207a..f8f530207a 100644
--- a/MdePkg/Library/BaseLib/CpuDeadLoop.c
+++ b/OldMdePkg/Library/BaseLib/CpuDeadLoop.c
diff --git a/MdePkg/Library/BaseLib/DivS64x64Remainder.c b/OldMdePkg/Library/BaseLib/DivS64x64Remainder.c
index efa091088e..efa091088e 100644
--- a/MdePkg/Library/BaseLib/DivS64x64Remainder.c
+++ b/OldMdePkg/Library/BaseLib/DivS64x64Remainder.c
diff --git a/MdePkg/Library/BaseLib/DivU64x32.c b/OldMdePkg/Library/BaseLib/DivU64x32.c
index b223c6c87b..b223c6c87b 100644
--- a/MdePkg/Library/BaseLib/DivU64x32.c
+++ b/OldMdePkg/Library/BaseLib/DivU64x32.c
diff --git a/MdePkg/Library/BaseLib/DivU64x32Remainder.c b/OldMdePkg/Library/BaseLib/DivU64x32Remainder.c
index e7a3094c6e..e7a3094c6e 100644
--- a/MdePkg/Library/BaseLib/DivU64x32Remainder.c
+++ b/OldMdePkg/Library/BaseLib/DivU64x32Remainder.c
diff --git a/MdePkg/Library/BaseLib/DivU64x64Remainder.c b/OldMdePkg/Library/BaseLib/DivU64x64Remainder.c
index c39537e4fb..c39537e4fb 100644
--- a/MdePkg/Library/BaseLib/DivU64x64Remainder.c
+++ b/OldMdePkg/Library/BaseLib/DivU64x64Remainder.c
diff --git a/MdePkg/Library/BaseLib/Ebc/CpuBreakpoint.c b/OldMdePkg/Library/BaseLib/Ebc/CpuBreakpoint.c
index 352e1c7c1f..352e1c7c1f 100644
--- a/MdePkg/Library/BaseLib/Ebc/CpuBreakpoint.c
+++ b/OldMdePkg/Library/BaseLib/Ebc/CpuBreakpoint.c
diff --git a/MdePkg/Library/BaseLib/Ebc/SetJumpLongJump.c b/OldMdePkg/Library/BaseLib/Ebc/SetJumpLongJump.c
index b485d3e495..b485d3e495 100644
--- a/MdePkg/Library/BaseLib/Ebc/SetJumpLongJump.c
+++ b/OldMdePkg/Library/BaseLib/Ebc/SetJumpLongJump.c
diff --git a/MdePkg/Library/BaseLib/Ebc/SwitchStack.c b/OldMdePkg/Library/BaseLib/Ebc/SwitchStack.c
index d2861c4f85..d2861c4f85 100644
--- a/MdePkg/Library/BaseLib/Ebc/SwitchStack.c
+++ b/OldMdePkg/Library/BaseLib/Ebc/SwitchStack.c
diff --git a/MdePkg/Library/BaseLib/Ebc/Synchronization.c b/OldMdePkg/Library/BaseLib/Ebc/Synchronization.c
index 5d5bc2ff11..5d5bc2ff11 100644
--- a/MdePkg/Library/BaseLib/Ebc/Synchronization.c
+++ b/OldMdePkg/Library/BaseLib/Ebc/Synchronization.c
diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c b/OldMdePkg/Library/BaseLib/GetPowerOfTwo32.c
index a639fd4a6d..a639fd4a6d 100644
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo32.c
+++ b/OldMdePkg/Library/BaseLib/GetPowerOfTwo32.c
diff --git a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c b/OldMdePkg/Library/BaseLib/GetPowerOfTwo64.c
index 52d148c924..52d148c924 100644
--- a/MdePkg/Library/BaseLib/GetPowerOfTwo64.c
+++ b/OldMdePkg/Library/BaseLib/GetPowerOfTwo64.c
diff --git a/MdePkg/Library/BaseLib/HighBitSet32.c b/OldMdePkg/Library/BaseLib/HighBitSet32.c
index 5ab4d7fe8d..5ab4d7fe8d 100644
--- a/MdePkg/Library/BaseLib/HighBitSet32.c
+++ b/OldMdePkg/Library/BaseLib/HighBitSet32.c
diff --git a/MdePkg/Library/BaseLib/HighBitSet64.c b/OldMdePkg/Library/BaseLib/HighBitSet64.c
index 6b3c585f37..6b3c585f37 100644
--- a/MdePkg/Library/BaseLib/HighBitSet64.c
+++ b/OldMdePkg/Library/BaseLib/HighBitSet64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S b/OldMdePkg/Library/BaseLib/Ia32/ARShiftU64.S
index 5498d2e991..5498d2e991 100644
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ARShiftU64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.asm b/OldMdePkg/Library/BaseLib/Ia32/ARShiftU64.asm
index 17f07bb66c..17f07bb66c 100644
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ARShiftU64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c b/OldMdePkg/Library/BaseLib/Ia32/ARShiftU64.c
index 01e0bdf7a2..01e0bdf7a2 100644
--- a/MdePkg/Library/BaseLib/Ia32/ARShiftU64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ARShiftU64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S b/OldMdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S
index e82434b670..e82434b670 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuBreakpoint.S
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm b/OldMdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm
index a4d397874d..a4d397874d 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c b/OldMdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
index fc5b63734b..fc5b63734b 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuBreakpoint.c
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S b/OldMdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S
index f8b1cdc7ee..f8b1cdc7ee 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuFlushTlb.S
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.asm b/OldMdePkg/Library/BaseLib/Ia32/CpuFlushTlb.asm
index 4f0c4f9944..4f0c4f9944 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuFlushTlb.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c b/OldMdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
index 2eea64d05c..2eea64d05c 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuFlushTlb.c
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.S b/OldMdePkg/Library/BaseLib/Ia32/CpuId.S
index 6f41e72227..6f41e72227 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuId.S
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.asm b/OldMdePkg/Library/BaseLib/Ia32/CpuId.asm
index 5c0eb1ffc8..5c0eb1ffc8 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuId.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/OldMdePkg/Library/BaseLib/Ia32/CpuId.c
index 64b215a462..64b215a462 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuId.c
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S b/OldMdePkg/Library/BaseLib/Ia32/CpuIdEx.S
index 48554cc96b..48554cc96b 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuIdEx.S
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm b/OldMdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
index cdebec2114..cdebec2114 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuIdEx.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c b/OldMdePkg/Library/BaseLib/Ia32/CpuIdEx.c
index 8e475d833d..8e475d833d 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuIdEx.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuIdEx.c
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.S b/OldMdePkg/Library/BaseLib/Ia32/CpuPause.S
index 5fef9c8d5c..5fef9c8d5c 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuPause.S
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.asm b/OldMdePkg/Library/BaseLib/Ia32/CpuPause.asm
index 4c7135fc9c..4c7135fc9c 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuPause.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuPause.c b/OldMdePkg/Library/BaseLib/Ia32/CpuPause.c
index 0a4c101884..0a4c101884 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuPause.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuPause.c
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.S b/OldMdePkg/Library/BaseLib/Ia32/CpuSleep.S
index ac39e8fcba..ac39e8fcba 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuSleep.S
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.asm b/OldMdePkg/Library/BaseLib/Ia32/CpuSleep.asm
index 8a779f7017..8a779f7017 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuSleep.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c b/OldMdePkg/Library/BaseLib/Ia32/CpuSleep.c
index fa00381bd0..fa00381bd0 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuSleep.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/CpuSleep.c
diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.S b/OldMdePkg/Library/BaseLib/Ia32/DisableInterrupts.S
index ea04225fd6..ea04225fd6 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/DisableInterrupts.S
diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.asm b/OldMdePkg/Library/BaseLib/Ia32/DisableInterrupts.asm
index 35209ff0d4..35209ff0d4 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/DisableInterrupts.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c b/OldMdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
index 5d694090f6..5d694090f6 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/DisableInterrupts.c
diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.S b/OldMdePkg/Library/BaseLib/Ia32/DisablePaging32.S
index 7898e8103a..7898e8103a 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/DisablePaging32.S
diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.asm b/OldMdePkg/Library/BaseLib/Ia32/DisablePaging32.asm
index d2949773b3..d2949773b3 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/DisablePaging32.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c b/OldMdePkg/Library/BaseLib/Ia32/DisablePaging32.c
index 58597ce133..58597ce133 100644
--- a/MdePkg/Library/BaseLib/Ia32/DisablePaging32.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/DisablePaging32.c
diff --git a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c b/OldMdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
index 1dfac5d317..1dfac5d317 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivS64x64Remainder.c
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.S b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32.S
index b858278e64..b858278e64 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32.S
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.asm b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32.asm
index 25ca074ad9..25ca074ad9 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32.c
index 7ec3c2d985..7ec3c2d985 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32.c
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S
index 974373d284..974373d284 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.S
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.asm b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.asm
index e025b22c2d..e025b22c2d 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
index 8f74930618..8f74930618 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x32Remainder.c
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S b/OldMdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
index cac7169d58..cac7169d58 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.S
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.asm b/OldMdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.asm
index 95e57efac1..95e57efac1 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c b/OldMdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
index 14b2f2789b..14b2f2789b 100644
--- a/MdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/DivU64x64Remainder.c
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S b/OldMdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S
index c5742aee53..c5742aee53 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.S
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm b/OldMdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm
index fe2016da87..fe2016da87 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c b/OldMdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
index fe6ebf78dc..fe6ebf78dc 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.c
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.S b/OldMdePkg/Library/BaseLib/Ia32/EnableInterrupts.S
index 2d608036f7..2d608036f7 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnableInterrupts.S
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm b/OldMdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm
index 194dd8f935..194dd8f935 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c b/OldMdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
index 2770e637b5..2770e637b5 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnableInterrupts.c
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.S b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging32.S
index df5d67cfac..df5d67cfac 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging32.S
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.asm b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging32.asm
index ae98b93285..ae98b93285 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging32.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging32.c
index 7aecd01790..7aecd01790 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging32.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging32.c
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging64.S
index ffa9beb0a1..ffa9beb0a1 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
index 435bb39105..435bb39105 100644
--- a/MdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/EnablePaging64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.S b/OldMdePkg/Library/BaseLib/Ia32/FlushCacheLine.S
index 07a92619d2..07a92619d2 100644
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/FlushCacheLine.S
diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.asm b/OldMdePkg/Library/BaseLib/Ia32/FlushCacheLine.asm
index f4ad87de7b..f4ad87de7b 100644
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/FlushCacheLine.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c b/OldMdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
index 4b3c7f7b62..4b3c7f7b62 100644
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.S b/OldMdePkg/Library/BaseLib/Ia32/FxRestore.S
index 9cfa14be0f..9cfa14be0f 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/FxRestore.S
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.asm b/OldMdePkg/Library/BaseLib/Ia32/FxRestore.asm
index 5def311700..5def311700 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/FxRestore.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.c b/OldMdePkg/Library/BaseLib/Ia32/FxRestore.c
index 155a1599b1..155a1599b1 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/FxRestore.c
diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.S b/OldMdePkg/Library/BaseLib/Ia32/FxSave.S
index 8857a8ec77..8857a8ec77 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/FxSave.S
diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.asm b/OldMdePkg/Library/BaseLib/Ia32/FxSave.asm
index d3a9f9cd48..d3a9f9cd48 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/FxSave.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.c b/OldMdePkg/Library/BaseLib/Ia32/FxSave.c
index 9a013e11be..9a013e11be 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/FxSave.c
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
index a0a6ad9eb0..a0a6ad9eb0 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.asm b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.asm
index 47d959fa6a..47d959fa6a 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
index 07be35e1df..07be35e1df 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange32.c
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
index 98a20a5e29..98a20a5e29 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.asm b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.asm
index 18311e77d3..18311e77d3 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
index d3747bed2c..d3747bed2c 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedCompareExchange64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S b/OldMdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S
index dc8f7215cc..dc8f7215cc 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedDecrement.S
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.asm b/OldMdePkg/Library/BaseLib/Ia32/InterlockedDecrement.asm
index 082429e520..082429e520 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedDecrement.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c b/OldMdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
index c3854e96be..c3854e96be 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedDecrement.c
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S b/OldMdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S
index ecbbc7540c..ecbbc7540c 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedIncrement.S
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.asm b/OldMdePkg/Library/BaseLib/Ia32/InterlockedIncrement.asm
index ea27e666ca..ea27e666ca 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedIncrement.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c b/OldMdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
index 4fa35c6e08..4fa35c6e08 100644
--- a/MdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/InterlockedIncrement.c
diff --git a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c b/OldMdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
index c918f9f571..c918f9f571 100644
--- a/MdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/InternalSwitchStack.c
diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.S b/OldMdePkg/Library/BaseLib/Ia32/Invd.S
index 0a0c1a244a..0a0c1a244a 100644
--- a/MdePkg/Library/BaseLib/Ia32/Invd.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/Invd.S
diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.asm b/OldMdePkg/Library/BaseLib/Ia32/Invd.asm
index 5767f54848..5767f54848 100644
--- a/MdePkg/Library/BaseLib/Ia32/Invd.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/Invd.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.c b/OldMdePkg/Library/BaseLib/Ia32/Invd.c
index 2fdfd28e22..2fdfd28e22 100644
--- a/MdePkg/Library/BaseLib/Ia32/Invd.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/Invd.c
diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.S b/OldMdePkg/Library/BaseLib/Ia32/LRotU64.S
index 3b866e2700..3b866e2700 100644
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/LRotU64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.asm b/OldMdePkg/Library/BaseLib/Ia32/LRotU64.asm
index a6437d868f..a6437d868f 100644
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/LRotU64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/LRotU64.c b/OldMdePkg/Library/BaseLib/Ia32/LRotU64.c
index 7761b9549b..7761b9549b 100644
--- a/MdePkg/Library/BaseLib/Ia32/LRotU64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/LRotU64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.S b/OldMdePkg/Library/BaseLib/Ia32/LShiftU64.S
index a4b99eb80a..a4b99eb80a 100644
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/LShiftU64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.asm b/OldMdePkg/Library/BaseLib/Ia32/LShiftU64.asm
index 6c3d9a4ee6..6c3d9a4ee6 100644
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/LShiftU64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c b/OldMdePkg/Library/BaseLib/Ia32/LShiftU64.c
index 193a41222f..193a41222f 100644
--- a/MdePkg/Library/BaseLib/Ia32/LShiftU64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/LShiftU64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.S b/OldMdePkg/Library/BaseLib/Ia32/LongJump.S
index 0b76896085..0b76896085 100644
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/LongJump.S
diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.asm b/OldMdePkg/Library/BaseLib/Ia32/LongJump.asm
index 0309f6ae71..0309f6ae71 100644
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/LongJump.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/LongJump.c b/OldMdePkg/Library/BaseLib/Ia32/LongJump.c
index 0e58625a65..0e58625a65 100644
--- a/MdePkg/Library/BaseLib/Ia32/LongJump.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/LongJump.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.S b/OldMdePkg/Library/BaseLib/Ia32/ModU64x32.S
index 00dc6a08ab..00dc6a08ab 100644
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ModU64x32.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.asm b/OldMdePkg/Library/BaseLib/Ia32/ModU64x32.asm
index 9e5f9aeda9..9e5f9aeda9 100644
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ModU64x32.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c b/OldMdePkg/Library/BaseLib/Ia32/ModU64x32.c
index f935632f6b..f935632f6b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ModU64x32.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ModU64x32.c
diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.S b/OldMdePkg/Library/BaseLib/Ia32/Monitor.S
index 6e9284dcd4..6e9284dcd4 100644
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/Monitor.S
diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.asm b/OldMdePkg/Library/BaseLib/Ia32/Monitor.asm
index 174bd7665f..174bd7665f 100644
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/Monitor.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.c b/OldMdePkg/Library/BaseLib/Ia32/Monitor.c
index e1f52b99be..e1f52b99be 100644
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/Monitor.c
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S b/OldMdePkg/Library/BaseLib/Ia32/MultU64x32.S
index b9d1eb8ca7..b9d1eb8ca7 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/MultU64x32.S
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.asm b/OldMdePkg/Library/BaseLib/Ia32/MultU64x32.asm
index 9c9ef06996..9c9ef06996 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/MultU64x32.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c b/OldMdePkg/Library/BaseLib/Ia32/MultU64x32.c
index ea0643d830..ea0643d830 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x32.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/MultU64x32.c
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.S b/OldMdePkg/Library/BaseLib/Ia32/MultU64x64.S
index 03523865f6..03523865f6 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/MultU64x64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.asm b/OldMdePkg/Library/BaseLib/Ia32/MultU64x64.asm
index f3679548f1..f3679548f1 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/MultU64x64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c b/OldMdePkg/Library/BaseLib/Ia32/MultU64x64.c
index a014b4406e..a014b4406e 100644
--- a/MdePkg/Library/BaseLib/Ia32/MultU64x64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/MultU64x64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.S b/OldMdePkg/Library/BaseLib/Ia32/Mwait.S
index 12f6a87511..12f6a87511 100644
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/Mwait.S
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.asm b/OldMdePkg/Library/BaseLib/Ia32/Mwait.asm
index 3e5f48c280..3e5f48c280 100644
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/Mwait.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.c b/OldMdePkg/Library/BaseLib/Ia32/Mwait.c
index 0256f2c841..0256f2c841 100644
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/Mwait.c
diff --git a/MdePkg/Library/BaseLib/Ia32/Non-existing.c b/OldMdePkg/Library/BaseLib/Ia32/Non-existing.c
index 89ba2f2ced..89ba2f2ced 100644
--- a/MdePkg/Library/BaseLib/Ia32/Non-existing.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/Non-existing.c
diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.S b/OldMdePkg/Library/BaseLib/Ia32/RRotU64.S
index 35935639b9..35935639b9 100644
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/RRotU64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.asm b/OldMdePkg/Library/BaseLib/Ia32/RRotU64.asm
index fe13abc0d5..fe13abc0d5 100644
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/RRotU64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/RRotU64.c b/OldMdePkg/Library/BaseLib/Ia32/RRotU64.c
index f91fc378a2..f91fc378a2 100644
--- a/MdePkg/Library/BaseLib/Ia32/RRotU64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/RRotU64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S b/OldMdePkg/Library/BaseLib/Ia32/RShiftU64.S
index ca78394e39..ca78394e39 100644
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/RShiftU64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.asm b/OldMdePkg/Library/BaseLib/Ia32/RShiftU64.asm
index faa4e96771..faa4e96771 100644
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/RShiftU64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c b/OldMdePkg/Library/BaseLib/Ia32/RShiftU64.c
index cc878e878c..cc878e878c 100644
--- a/MdePkg/Library/BaseLib/Ia32/RShiftU64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/RShiftU64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.S b/OldMdePkg/Library/BaseLib/Ia32/ReadCr0.S
index 3433344b7b..3433344b7b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr0.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadCr0.asm
index a8fe4a7e89..a8fe4a7e89 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr0.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c b/OldMdePkg/Library/BaseLib/Ia32/ReadCr0.c
index ce43048a36..ce43048a36 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr0.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.S b/OldMdePkg/Library/BaseLib/Ia32/ReadCr2.S
index d308895367..d308895367 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr2.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadCr2.asm
index a6a9b8c08f..a6a9b8c08f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr2.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c b/OldMdePkg/Library/BaseLib/Ia32/ReadCr2.c
index 2a61e1bbb6..2a61e1bbb6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr2.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.S b/OldMdePkg/Library/BaseLib/Ia32/ReadCr3.S
index aaec1f01d0..aaec1f01d0 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr3.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadCr3.asm
index 97b9ee4b99..97b9ee4b99 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr3.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c b/OldMdePkg/Library/BaseLib/Ia32/ReadCr3.c
index c151accabb..c151accabb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr3.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.S b/OldMdePkg/Library/BaseLib/Ia32/ReadCr4.S
index 442d359eda..442d359eda 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr4.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadCr4.asm
index a454903387..a454903387 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr4.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c b/OldMdePkg/Library/BaseLib/Ia32/ReadCr4.c
index c88dd311e1..c88dd311e1 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCr4.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.S b/OldMdePkg/Library/BaseLib/Ia32/ReadCs.S
index a3ad69d304..a3ad69d304 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCs.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadCs.asm
index 68497e21fe..68497e21fe 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCs.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.c b/OldMdePkg/Library/BaseLib/Ia32/ReadCs.c
index f93e16cb93..f93e16cb93 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadCs.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr0.S
index d4c61f1484..d4c61f1484 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr0.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr0.asm
index 8792ce40b9..8792ce40b9 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr0.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr0.c
index b3ff929552..b3ff929552 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr0.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr1.S
index 27c5554257..27c5554257 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr1.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr1.asm
index e924407d57..e924407d57 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr1.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr1.c
index 6d9f8999b6..6d9f8999b6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr1.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr2.S
index cca84b9efd..cca84b9efd 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr2.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr2.asm
index bbbef7e2fa..bbbef7e2fa 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr2.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr2.c
index 638bf8f7ae..638bf8f7ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr2.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr3.S
index 60b0550381..60b0550381 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr3.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr3.asm
index af2e7a2689..af2e7a2689 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr3.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr3.c
index 82a3f860be..82a3f860be 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr3.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr4.S
index 84883df971..84883df971 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr4.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr4.asm
index 606f26fe2a..606f26fe2a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr4.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr4.c
index d68de88ba5..d68de88ba5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr4.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr5.S
index 5abb226b91..5abb226b91 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr5.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr5.asm
index 091792dab9..091792dab9 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr5.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr5.c
index 175e6f641c..175e6f641c 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr5.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr6.S
index 9594851c7e..9594851c7e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr6.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr6.asm
index 479414b3e6..479414b3e6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr6.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr6.c
index 28a918283a..28a918283a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr6.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDr7.S
index 4ba13efcb4..4ba13efcb4 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr7.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDr7.asm
index 7dee98121c..7dee98121c 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr7.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDr7.c
index b0ac10fe96..b0ac10fe96 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDr7.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.S b/OldMdePkg/Library/BaseLib/Ia32/ReadDs.S
index c3dc8451ad..c3dc8451ad 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDs.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadDs.asm
index b8edcb6996..b8edcb6996 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDs.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.c b/OldMdePkg/Library/BaseLib/Ia32/ReadDs.c
index 13990b5195..13990b5195 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadDs.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.S b/OldMdePkg/Library/BaseLib/Ia32/ReadEflags.S
index ab5e522739..ab5e522739 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadEflags.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadEflags.asm
index 32d55b35b9..32d55b35b9 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadEflags.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c b/OldMdePkg/Library/BaseLib/Ia32/ReadEflags.c
index c927d66a59..c927d66a59 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadEflags.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.S b/OldMdePkg/Library/BaseLib/Ia32/ReadEs.S
index 26ed55d9e1..26ed55d9e1 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadEs.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadEs.asm
index 48f141748e..48f141748e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadEs.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.c b/OldMdePkg/Library/BaseLib/Ia32/ReadEs.c
index 2fa183b00a..2fa183b00a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadEs.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.S b/OldMdePkg/Library/BaseLib/Ia32/ReadFs.S
index bd38c6ac10..bd38c6ac10 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadFs.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadFs.asm
index ae87107599..ae87107599 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadFs.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.c b/OldMdePkg/Library/BaseLib/Ia32/ReadFs.c
index d142e4d370..d142e4d370 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadFs.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.S b/OldMdePkg/Library/BaseLib/Ia32/ReadGdtr.S
index 8869164606..8869164606 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadGdtr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadGdtr.asm
index beacb62b0d..beacb62b0d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadGdtr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c b/OldMdePkg/Library/BaseLib/Ia32/ReadGdtr.c
index 86bb10d12e..86bb10d12e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadGdtr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.S b/OldMdePkg/Library/BaseLib/Ia32/ReadGs.S
index 82b396661d..82b396661d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadGs.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadGs.asm
index 93313b8998..93313b8998 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadGs.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.c b/OldMdePkg/Library/BaseLib/Ia32/ReadGs.c
index 3cebfd60cb..3cebfd60cb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadGs.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.S b/OldMdePkg/Library/BaseLib/Ia32/ReadIdtr.S
index 0e5d32e3d8..0e5d32e3d8 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadIdtr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadIdtr.asm
index dc7d473507..dc7d473507 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadIdtr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c b/OldMdePkg/Library/BaseLib/Ia32/ReadIdtr.c
index e5885cce59..e5885cce59 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadIdtr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.S b/OldMdePkg/Library/BaseLib/Ia32/ReadLdtr.S
index addb1757d0..addb1757d0 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadLdtr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadLdtr.asm
index 449b7cfe99..449b7cfe99 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadLdtr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c b/OldMdePkg/Library/BaseLib/Ia32/ReadLdtr.c
index 0950f8bad5..0950f8bad5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadLdtr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm0.S
index f191337f68..f191337f68 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm0.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm0.asm
index e43c45fab4..e43c45fab4 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm0.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm0.c
index d42f95e8b5..d42f95e8b5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm0.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm1.S
index 790541aaeb..790541aaeb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm1.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm1.asm
index 9f92a44aa0..9f92a44aa0 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm1.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm1.c
index e4d0e08b93..e4d0e08b93 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm1.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm2.S
index 231d62c762..231d62c762 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm2.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm2.asm
index 38e4cb0047..38e4cb0047 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm2.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm2.c
index c2e49209b8..c2e49209b8 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm2.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm3.S
index 1e1f6dd684..1e1f6dd684 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm3.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm3.asm
index e646762bf3..e646762bf3 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm3.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm3.c
index 680db3be05..680db3be05 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm3.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm4.S
index 5da446befe..5da446befe 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm4.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm4.asm
index 8da079d82c..8da079d82c 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm4.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm4.c
index b51619cb99..b51619cb99 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm4.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm5.S
index 5528fe1812..5528fe1812 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm5.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm5.asm
index 9d6b4746a6..9d6b4746a6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm5.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm5.c
index a502e38d96..a502e38d96 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm5.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm6.S
index 5d9bd11269..5d9bd11269 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm6.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm6.asm
index 95c73f601b..95c73f601b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm6.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm6.c
index a97aae68ed..a97aae68ed 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm6.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMm7.S
index 26866b6a09..26866b6a09 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm7.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMm7.asm
index 0bd3b9b61f..0bd3b9b61f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm7.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMm7.c
index 4ae5d63de5..4ae5d63de5 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMm7.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.S b/OldMdePkg/Library/BaseLib/Ia32/ReadMsr64.S
index 505b7e688b..505b7e688b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMsr64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadMsr64.asm
index 9a3e11ccca..9a3e11ccca 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMsr64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c b/OldMdePkg/Library/BaseLib/Ia32/ReadMsr64.c
index fb7554805e..fb7554805e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadMsr64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.S b/OldMdePkg/Library/BaseLib/Ia32/ReadPmc.S
index 055e99c25a..055e99c25a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadPmc.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadPmc.asm
index 17156d4652..17156d4652 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadPmc.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c b/OldMdePkg/Library/BaseLib/Ia32/ReadPmc.c
index a8b647dfbd..a8b647dfbd 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadPmc.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.S b/OldMdePkg/Library/BaseLib/Ia32/ReadSs.S
index 4f15248f1a..4f15248f1a 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadSs.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadSs.asm
index 414353755f..414353755f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadSs.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.c b/OldMdePkg/Library/BaseLib/Ia32/ReadSs.c
index 62ad42453d..62ad42453d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadSs.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.S b/OldMdePkg/Library/BaseLib/Ia32/ReadTr.S
index af12dd2f3f..af12dd2f3f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadTr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadTr.asm
index 4f4e64b186..4f4e64b186 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadTr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.c b/OldMdePkg/Library/BaseLib/Ia32/ReadTr.c
index 5068c7f0a6..5068c7f0a6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadTr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.S b/OldMdePkg/Library/BaseLib/Ia32/ReadTsc.S
index cab29661ae..cab29661ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadTsc.S
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.asm b/OldMdePkg/Library/BaseLib/Ia32/ReadTsc.asm
index fff38292ef..fff38292ef 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadTsc.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c b/OldMdePkg/Library/BaseLib/Ia32/ReadTsc.c
index 2fa89f934d..2fa89f934d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/ReadTsc.c
diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.S b/OldMdePkg/Library/BaseLib/Ia32/SetJump.S
index c8993084ac..c8993084ac 100644
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/SetJump.S
diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.asm b/OldMdePkg/Library/BaseLib/Ia32/SetJump.asm
index 4b7b40c47a..4b7b40c47a 100644
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/SetJump.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/SetJump.c b/OldMdePkg/Library/BaseLib/Ia32/SetJump.c
index 4f4dbca057..4f4dbca057 100644
--- a/MdePkg/Library/BaseLib/Ia32/SetJump.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/SetJump.c
diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.S b/OldMdePkg/Library/BaseLib/Ia32/SwapBytes64.S
index c15ca444f0..c15ca444f0 100644
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/SwapBytes64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.asm b/OldMdePkg/Library/BaseLib/Ia32/SwapBytes64.asm
index 7647880202..7647880202 100644
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/SwapBytes64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c b/OldMdePkg/Library/BaseLib/Ia32/SwapBytes64.c
index 1dd6adb68d..1dd6adb68d 100644
--- a/MdePkg/Library/BaseLib/Ia32/SwapBytes64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/SwapBytes64.c
diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.S b/OldMdePkg/Library/BaseLib/Ia32/Thunk16.S
index c45cdb0a2d..c45cdb0a2d 100644
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/Thunk16.S
diff --git a/MdePkg/Library/BaseLib/Ia32/Thunk16.asm b/OldMdePkg/Library/BaseLib/Ia32/Thunk16.asm
index 5c9bc81a2b..5c9bc81a2b 100644
--- a/MdePkg/Library/BaseLib/Ia32/Thunk16.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/Thunk16.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.S b/OldMdePkg/Library/BaseLib/Ia32/Wbinvd.S
index b19348dad9..b19348dad9 100644
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/Wbinvd.S
diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.asm b/OldMdePkg/Library/BaseLib/Ia32/Wbinvd.asm
index 1230c89c20..1230c89c20 100644
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/Wbinvd.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c b/OldMdePkg/Library/BaseLib/Ia32/Wbinvd.c
index ae7576645d..ae7576645d 100644
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/Wbinvd.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.S b/OldMdePkg/Library/BaseLib/Ia32/WriteCr0.S
index 6bce3a4d50..6bce3a4d50 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr0.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteCr0.asm
index 5eab67f819..5eab67f819 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr0.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c b/OldMdePkg/Library/BaseLib/Ia32/WriteCr0.c
index 909b202907..909b202907 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr0.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.S b/OldMdePkg/Library/BaseLib/Ia32/WriteCr2.S
index 64d2c1b534..64d2c1b534 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr2.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteCr2.asm
index 0df84412bf..0df84412bf 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr2.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c b/OldMdePkg/Library/BaseLib/Ia32/WriteCr2.c
index 85921e0961..85921e0961 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr2.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.S b/OldMdePkg/Library/BaseLib/Ia32/WriteCr3.S
index 767182ee4e..767182ee4e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr3.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteCr3.asm
index 32b05fdf35..32b05fdf35 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr3.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c b/OldMdePkg/Library/BaseLib/Ia32/WriteCr3.c
index 0714d8e76f..0714d8e76f 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr3.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.S b/OldMdePkg/Library/BaseLib/Ia32/WriteCr4.S
index dc6828ac91..dc6828ac91 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr4.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteCr4.asm
index 4ed7f61030..4ed7f61030 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr4.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c b/OldMdePkg/Library/BaseLib/Ia32/WriteCr4.c
index e0f4bf0a88..e0f4bf0a88 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteCr4.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr0.S
index c05af0ec1e..c05af0ec1e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr0.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr0.asm
index 1bd39d50e4..1bd39d50e4 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr0.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr0.c
index f98098076c..f98098076c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr0.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr1.S
index 87031768ac..87031768ac 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr1.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr1.asm
index 542125ba55..542125ba55 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr1.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr1.c
index 4f29303218..4f29303218 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr1.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr2.S
index ca4e301b93..ca4e301b93 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr2.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr2.asm
index 7638babc73..7638babc73 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr2.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr2.c
index 190fb228a8..190fb228a8 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr2.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr3.S
index ed23db7e90..ed23db7e90 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr3.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr3.asm
index 69a17b4ad3..69a17b4ad3 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr3.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr3.c
index ad2d1ad75a..ad2d1ad75a 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr3.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr4.S
index d17595213a..d17595213a 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr4.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr4.asm
index 9c10305b4d..9c10305b4d 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr4.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr4.c
index 27862486be..27862486be 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr4.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr5.S
index 7e3bb94f1f..7e3bb94f1f 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr5.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr5.asm
index e10434ef3d..e10434ef3d 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr5.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr5.c
index c6e118e9fa..c6e118e9fa 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr5.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr6.S
index 0827f347bd..0827f347bd 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr6.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr6.asm
index 4e5acf58b0..4e5acf58b0 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr6.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr6.c
index bc7d8048b0..bc7d8048b0 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr6.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.S b/OldMdePkg/Library/BaseLib/Ia32/WriteDr7.S
index 1f3e916675..1f3e916675 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr7.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteDr7.asm
index 10e83d6fe7..10e83d6fe7 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr7.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c b/OldMdePkg/Library/BaseLib/Ia32/WriteDr7.c
index a3bd33cc95..a3bd33cc95 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteDr7.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.S b/OldMdePkg/Library/BaseLib/Ia32/WriteGdtr.S
index 3aedf7dd68..3aedf7dd68 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteGdtr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteGdtr.asm
index f1c7a92e3b..f1c7a92e3b 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteGdtr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c b/OldMdePkg/Library/BaseLib/Ia32/WriteGdtr.c
index 0f937e691b..0f937e691b 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteGdtr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.S b/OldMdePkg/Library/BaseLib/Ia32/WriteIdtr.S
index c3e6ad3353..c3e6ad3353 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteIdtr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteIdtr.asm
index 65fca407f2..65fca407f2 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteIdtr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c b/OldMdePkg/Library/BaseLib/Ia32/WriteIdtr.c
index d43b204493..d43b204493 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteIdtr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.S b/OldMdePkg/Library/BaseLib/Ia32/WriteLdtr.S
index 8b2cc3c029..8b2cc3c029 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteLdtr.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteLdtr.asm
index 39f8b2ed5e..39f8b2ed5e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteLdtr.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c b/OldMdePkg/Library/BaseLib/Ia32/WriteLdtr.c
index c320b96e14..c320b96e14 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteLdtr.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm0.S
index ef70763e52..ef70763e52 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm0.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm0.asm
index 15912f6c4a..15912f6c4a 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm0.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm0.c
index d6e66d4632..d6e66d4632 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm0.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm1.S
index 74a3d711b5..74a3d711b5 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm1.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm1.asm
index 097e760e8c..097e760e8c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm1.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm1.c
index abdda7f0ae..abdda7f0ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm1.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm2.S
index a3c548dcec..a3c548dcec 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm2.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm2.asm
index fea7081d28..fea7081d28 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm2.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm2.c
index d0ff1eb5f4..d0ff1eb5f4 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm2.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm3.S
index 98b11a5818..98b11a5818 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm3.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm3.asm
index 1af24908f7..1af24908f7 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm3.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm3.c
index 5851fb5b50..5851fb5b50 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm3.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm4.S
index 107c695cf7..107c695cf7 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm4.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm4.asm
index 2cf9da095c..2cf9da095c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm4.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm4.c
index 50017a93f1..50017a93f1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm4.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm5.S
index be6a6f78b2..be6a6f78b2 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm5.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm5.asm
index 9c9882ef10..9c9882ef10 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm5.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm5.c
index df8d457100..df8d457100 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm5.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm6.S
index 51a8973460..51a8973460 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm6.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm6.asm
index 5e0cfad563..5e0cfad563 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm6.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm6.c
index 9058565baa..9058565baa 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm6.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMm7.S
index 824bbeae17..824bbeae17 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm7.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMm7.asm
index faaa23bfd2..faaa23bfd2 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm7.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMm7.c
index 7d9a3a6ed1..7d9a3a6ed1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMm7.c
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.S b/OldMdePkg/Library/BaseLib/Ia32/WriteMsr64.S
index 5c12c981a9..5c12c981a9 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.S
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMsr64.S
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.asm b/OldMdePkg/Library/BaseLib/Ia32/WriteMsr64.asm
index 14edba60c1..14edba60c1 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.asm
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMsr64.asm
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c b/OldMdePkg/Library/BaseLib/Ia32/WriteMsr64.c
index 7e2fda0804..7e2fda0804 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
+++ b/OldMdePkg/Library/BaseLib/Ia32/WriteMsr64.c
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessDbr.s b/OldMdePkg/Library/BaseLib/Ipf/AccessDbr.s
index 49d1fecbbf..49d1fecbbf 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessDbr.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessDbr.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessEicr.s b/OldMdePkg/Library/BaseLib/Ipf/AccessEicr.s
index 03d7e034f8..03d7e034f8 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessEicr.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessEicr.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessGcr.s b/OldMdePkg/Library/BaseLib/Ipf/AccessGcr.s
index 54b3a30a6d..54b3a30a6d 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessGcr.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessGcr.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessGp.s b/OldMdePkg/Library/BaseLib/Ipf/AccessGp.s
index 5c5f20f584..5c5f20f584 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessGp.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessGp.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessKr.s b/OldMdePkg/Library/BaseLib/Ipf/AccessKr.s
index 5a38954292..5a38954292 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessKr.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessKr.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessPmr.s b/OldMdePkg/Library/BaseLib/Ipf/AccessPmr.s
index cea376c638..cea376c638 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessPmr.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessPmr.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AccessPsr.s b/OldMdePkg/Library/BaseLib/Ipf/AccessPsr.s
index 9b4fe49ff1..9b4fe49ff1 100644
--- a/MdePkg/Library/BaseLib/Ipf/AccessPsr.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AccessPsr.s
diff --git a/MdePkg/Library/BaseLib/Ipf/AsmPalCall.s b/OldMdePkg/Library/BaseLib/Ipf/AsmPalCall.s
index 9e70a78729..9e70a78729 100644
--- a/MdePkg/Library/BaseLib/Ipf/AsmPalCall.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/AsmPalCall.s
diff --git a/MdePkg/Library/BaseLib/Ipf/CpuBreakpoint.c b/OldMdePkg/Library/BaseLib/Ipf/CpuBreakpoint.c
index 49bd06b8c2..49bd06b8c2 100644
--- a/MdePkg/Library/BaseLib/Ipf/CpuBreakpoint.c
+++ b/OldMdePkg/Library/BaseLib/Ipf/CpuBreakpoint.c
diff --git a/MdePkg/Library/BaseLib/Ipf/CpuFlushTlb.s b/OldMdePkg/Library/BaseLib/Ipf/CpuFlushTlb.s
index 520c51f6ba..520c51f6ba 100644
--- a/MdePkg/Library/BaseLib/Ipf/CpuFlushTlb.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/CpuFlushTlb.s
diff --git a/MdePkg/Library/BaseLib/Ipf/CpuPause.s b/OldMdePkg/Library/BaseLib/Ipf/CpuPause.s
index f52692f438..f52692f438 100644
--- a/MdePkg/Library/BaseLib/Ipf/CpuPause.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/CpuPause.s
diff --git a/MdePkg/Library/BaseLib/Ipf/ExecFc.s b/OldMdePkg/Library/BaseLib/Ipf/ExecFc.s
index a5a9e9bc8a..a5a9e9bc8a 100644
--- a/MdePkg/Library/BaseLib/Ipf/ExecFc.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/ExecFc.s
diff --git a/MdePkg/Library/BaseLib/Ipf/FlushCacheRange.s b/OldMdePkg/Library/BaseLib/Ipf/FlushCacheRange.s
index 655ab37c26..655ab37c26 100644
--- a/MdePkg/Library/BaseLib/Ipf/FlushCacheRange.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/FlushCacheRange.s
diff --git a/MdePkg/Library/BaseLib/Ipf/GetInterruptState.s b/OldMdePkg/Library/BaseLib/Ipf/GetInterruptState.s
index d5b5fc852f..d5b5fc852f 100644
--- a/MdePkg/Library/BaseLib/Ipf/GetInterruptState.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/GetInterruptState.s
diff --git a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange32.s b/OldMdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange32.s
index 3a278d7268..3a278d7268 100644
--- a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange32.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange32.s
diff --git a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s b/OldMdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
index 88b9d2b490..88b9d2b490 100644
--- a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
diff --git a/MdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c b/OldMdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c
index 60d0a37562..60d0a37562 100644
--- a/MdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c
+++ b/OldMdePkg/Library/BaseLib/Ipf/InternalSwitchStack.c
diff --git a/MdePkg/Library/BaseLib/Ipf/PalCallStatic.s b/OldMdePkg/Library/BaseLib/Ipf/PalCallStatic.s
index c21d7427f9..c21d7427f9 100644
--- a/MdePkg/Library/BaseLib/Ipf/PalCallStatic.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/PalCallStatic.s
diff --git a/MdePkg/Library/BaseLib/Ipf/ReadCpuid.s b/OldMdePkg/Library/BaseLib/Ipf/ReadCpuid.s
index 2176dad116..2176dad116 100644
--- a/MdePkg/Library/BaseLib/Ipf/ReadCpuid.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/ReadCpuid.s
diff --git a/MdePkg/Library/BaseLib/Ipf/SwitchStack.s b/OldMdePkg/Library/BaseLib/Ipf/SwitchStack.s
index a3c524f119..a3c524f119 100644
--- a/MdePkg/Library/BaseLib/Ipf/SwitchStack.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/SwitchStack.s
diff --git a/MdePkg/Library/BaseLib/Ipf/Synchronization.c b/OldMdePkg/Library/BaseLib/Ipf/Synchronization.c
index c29a8763d3..c29a8763d3 100644
--- a/MdePkg/Library/BaseLib/Ipf/Synchronization.c
+++ b/OldMdePkg/Library/BaseLib/Ipf/Synchronization.c
diff --git a/MdePkg/Library/BaseLib/Ipf/Unaligned.c b/OldMdePkg/Library/BaseLib/Ipf/Unaligned.c
index fc634044b9..fc634044b9 100644
--- a/MdePkg/Library/BaseLib/Ipf/Unaligned.c
+++ b/OldMdePkg/Library/BaseLib/Ipf/Unaligned.c
diff --git a/MdePkg/Library/BaseLib/Ipf/asm.h b/OldMdePkg/Library/BaseLib/Ipf/asm.h
index 8ef0b30626..8ef0b30626 100644
--- a/MdePkg/Library/BaseLib/Ipf/asm.h
+++ b/OldMdePkg/Library/BaseLib/Ipf/asm.h
diff --git a/MdePkg/Library/BaseLib/Ipf/ia_64gen.h b/OldMdePkg/Library/BaseLib/Ipf/ia_64gen.h
index 081cc4a8f6..081cc4a8f6 100644
--- a/MdePkg/Library/BaseLib/Ipf/ia_64gen.h
+++ b/OldMdePkg/Library/BaseLib/Ipf/ia_64gen.h
diff --git a/MdePkg/Library/BaseLib/Ipf/longjmp.s b/OldMdePkg/Library/BaseLib/Ipf/longjmp.s
index 20a0df10f7..20a0df10f7 100644
--- a/MdePkg/Library/BaseLib/Ipf/longjmp.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/longjmp.s
diff --git a/MdePkg/Library/BaseLib/Ipf/setjmp.s b/OldMdePkg/Library/BaseLib/Ipf/setjmp.s
index e2b346ee72..e2b346ee72 100644
--- a/MdePkg/Library/BaseLib/Ipf/setjmp.s
+++ b/OldMdePkg/Library/BaseLib/Ipf/setjmp.s
diff --git a/MdePkg/Library/BaseLib/LRotU32.c b/OldMdePkg/Library/BaseLib/LRotU32.c
index ea782463d0..ea782463d0 100644
--- a/MdePkg/Library/BaseLib/LRotU32.c
+++ b/OldMdePkg/Library/BaseLib/LRotU32.c
diff --git a/MdePkg/Library/BaseLib/LRotU64.c b/OldMdePkg/Library/BaseLib/LRotU64.c
index cf751f98f5..cf751f98f5 100644
--- a/MdePkg/Library/BaseLib/LRotU64.c
+++ b/OldMdePkg/Library/BaseLib/LRotU64.c
diff --git a/MdePkg/Library/BaseLib/LShiftU64.c b/OldMdePkg/Library/BaseLib/LShiftU64.c
index 50449eb9e3..50449eb9e3 100644
--- a/MdePkg/Library/BaseLib/LShiftU64.c
+++ b/OldMdePkg/Library/BaseLib/LShiftU64.c
diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/OldMdePkg/Library/BaseLib/LinkedList.c
index f588eacd0c..f588eacd0c 100644
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/OldMdePkg/Library/BaseLib/LinkedList.c
diff --git a/MdePkg/Library/BaseLib/LongJump.c b/OldMdePkg/Library/BaseLib/LongJump.c
index 90a915e233..90a915e233 100644
--- a/MdePkg/Library/BaseLib/LongJump.c
+++ b/OldMdePkg/Library/BaseLib/LongJump.c
diff --git a/MdePkg/Library/BaseLib/LowBitSet32.c b/OldMdePkg/Library/BaseLib/LowBitSet32.c
index 5a21245264..5a21245264 100644
--- a/MdePkg/Library/BaseLib/LowBitSet32.c
+++ b/OldMdePkg/Library/BaseLib/LowBitSet32.c
diff --git a/MdePkg/Library/BaseLib/LowBitSet64.c b/OldMdePkg/Library/BaseLib/LowBitSet64.c
index a3e5ba0842..a3e5ba0842 100644
--- a/MdePkg/Library/BaseLib/LowBitSet64.c
+++ b/OldMdePkg/Library/BaseLib/LowBitSet64.c
diff --git a/MdePkg/Library/BaseLib/Math64.c b/OldMdePkg/Library/BaseLib/Math64.c
index 514ae99020..514ae99020 100644
--- a/MdePkg/Library/BaseLib/Math64.c
+++ b/OldMdePkg/Library/BaseLib/Math64.c
diff --git a/MdePkg/Library/BaseLib/ModU64x32.c b/OldMdePkg/Library/BaseLib/ModU64x32.c
index a8737f43f6..a8737f43f6 100644
--- a/MdePkg/Library/BaseLib/ModU64x32.c
+++ b/OldMdePkg/Library/BaseLib/ModU64x32.c
diff --git a/MdePkg/Library/BaseLib/MultS64x64.c b/OldMdePkg/Library/BaseLib/MultS64x64.c
index 7e8d3184f5..7e8d3184f5 100644
--- a/MdePkg/Library/BaseLib/MultS64x64.c
+++ b/OldMdePkg/Library/BaseLib/MultS64x64.c
diff --git a/MdePkg/Library/BaseLib/MultU64x32.c b/OldMdePkg/Library/BaseLib/MultU64x32.c
index c3a25c6f34..c3a25c6f34 100644
--- a/MdePkg/Library/BaseLib/MultU64x32.c
+++ b/OldMdePkg/Library/BaseLib/MultU64x32.c
diff --git a/MdePkg/Library/BaseLib/MultU64x64.c b/OldMdePkg/Library/BaseLib/MultU64x64.c
index 997abbc27e..997abbc27e 100644
--- a/MdePkg/Library/BaseLib/MultU64x64.c
+++ b/OldMdePkg/Library/BaseLib/MultU64x64.c
diff --git a/MdePkg/Library/BaseLib/RRotU32.c b/OldMdePkg/Library/BaseLib/RRotU32.c
index 93dda94b9f..93dda94b9f 100644
--- a/MdePkg/Library/BaseLib/RRotU32.c
+++ b/OldMdePkg/Library/BaseLib/RRotU32.c
diff --git a/MdePkg/Library/BaseLib/RRotU64.c b/OldMdePkg/Library/BaseLib/RRotU64.c
index d55bbfc79f..d55bbfc79f 100644
--- a/MdePkg/Library/BaseLib/RRotU64.c
+++ b/OldMdePkg/Library/BaseLib/RRotU64.c
diff --git a/MdePkg/Library/BaseLib/RShiftU64.c b/OldMdePkg/Library/BaseLib/RShiftU64.c
index f9ae4f6efa..f9ae4f6efa 100644
--- a/MdePkg/Library/BaseLib/RShiftU64.c
+++ b/OldMdePkg/Library/BaseLib/RShiftU64.c
diff --git a/MdePkg/Library/BaseLib/SetJump.c b/OldMdePkg/Library/BaseLib/SetJump.c
index d6c2723b2a..d6c2723b2a 100644
--- a/MdePkg/Library/BaseLib/SetJump.c
+++ b/OldMdePkg/Library/BaseLib/SetJump.c
diff --git a/MdePkg/Library/BaseLib/String.c b/OldMdePkg/Library/BaseLib/String.c
index 3236f4cfa6..3236f4cfa6 100644
--- a/MdePkg/Library/BaseLib/String.c
+++ b/OldMdePkg/Library/BaseLib/String.c
diff --git a/MdePkg/Library/BaseLib/SwapBytes16.c b/OldMdePkg/Library/BaseLib/SwapBytes16.c
index 134ccb1ef0..134ccb1ef0 100644
--- a/MdePkg/Library/BaseLib/SwapBytes16.c
+++ b/OldMdePkg/Library/BaseLib/SwapBytes16.c
diff --git a/MdePkg/Library/BaseLib/SwapBytes32.c b/OldMdePkg/Library/BaseLib/SwapBytes32.c
index 09396dba4e..09396dba4e 100644
--- a/MdePkg/Library/BaseLib/SwapBytes32.c
+++ b/OldMdePkg/Library/BaseLib/SwapBytes32.c
diff --git a/MdePkg/Library/BaseLib/SwapBytes64.c b/OldMdePkg/Library/BaseLib/SwapBytes64.c
index 1b0882fc9a..1b0882fc9a 100644
--- a/MdePkg/Library/BaseLib/SwapBytes64.c
+++ b/OldMdePkg/Library/BaseLib/SwapBytes64.c
diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/OldMdePkg/Library/BaseLib/SwitchStack.c
index b47cfe0b10..b47cfe0b10 100644
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/OldMdePkg/Library/BaseLib/SwitchStack.c
diff --git a/MdePkg/Library/BaseLib/Synchronization.c b/OldMdePkg/Library/BaseLib/Synchronization.c
index 225453149d..225453149d 100644
--- a/MdePkg/Library/BaseLib/Synchronization.c
+++ b/OldMdePkg/Library/BaseLib/Synchronization.c
diff --git a/MdePkg/Library/BaseLib/SynchronizationGcc.c b/OldMdePkg/Library/BaseLib/SynchronizationGcc.c
index 40b1e4a36b..40b1e4a36b 100644
--- a/MdePkg/Library/BaseLib/SynchronizationGcc.c
+++ b/OldMdePkg/Library/BaseLib/SynchronizationGcc.c
diff --git a/MdePkg/Library/BaseLib/SynchronizationMsc.c b/OldMdePkg/Library/BaseLib/SynchronizationMsc.c
index ce330aed88..ce330aed88 100644
--- a/MdePkg/Library/BaseLib/SynchronizationMsc.c
+++ b/OldMdePkg/Library/BaseLib/SynchronizationMsc.c
diff --git a/MdePkg/Library/BaseLib/Unaligned.c b/OldMdePkg/Library/BaseLib/Unaligned.c
index 18c486d50f..18c486d50f 100644
--- a/MdePkg/Library/BaseLib/Unaligned.c
+++ b/OldMdePkg/Library/BaseLib/Unaligned.c
diff --git a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.S b/OldMdePkg/Library/BaseLib/X64/CpuBreakpoint.S
index 710006bdd1..710006bdd1 100644
--- a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.S
+++ b/OldMdePkg/Library/BaseLib/X64/CpuBreakpoint.S
diff --git a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.asm b/OldMdePkg/Library/BaseLib/X64/CpuBreakpoint.asm
index f1ebe47b21..f1ebe47b21 100644
--- a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.asm
+++ b/OldMdePkg/Library/BaseLib/X64/CpuBreakpoint.asm
diff --git a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c b/OldMdePkg/Library/BaseLib/X64/CpuBreakpoint.c
index 01939e9128..01939e9128 100644
--- a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.c
+++ b/OldMdePkg/Library/BaseLib/X64/CpuBreakpoint.c
diff --git a/MdePkg/Library/BaseLib/X64/CpuFlushTlb.S b/OldMdePkg/Library/BaseLib/X64/CpuFlushTlb.S
index 2dbaf846c4..2dbaf846c4 100644
--- a/MdePkg/Library/BaseLib/X64/CpuFlushTlb.S
+++ b/OldMdePkg/Library/BaseLib/X64/CpuFlushTlb.S
diff --git a/MdePkg/Library/BaseLib/X64/CpuFlushTlb.asm b/OldMdePkg/Library/BaseLib/X64/CpuFlushTlb.asm
index c2c4490e9d..c2c4490e9d 100644
--- a/MdePkg/Library/BaseLib/X64/CpuFlushTlb.asm
+++ b/OldMdePkg/Library/BaseLib/X64/CpuFlushTlb.asm
diff --git a/MdePkg/Library/BaseLib/X64/CpuId.S b/OldMdePkg/Library/BaseLib/X64/CpuId.S
index 98d7faaa06..98d7faaa06 100644
--- a/MdePkg/Library/BaseLib/X64/CpuId.S
+++ b/OldMdePkg/Library/BaseLib/X64/CpuId.S
diff --git a/MdePkg/Library/BaseLib/X64/CpuId.asm b/OldMdePkg/Library/BaseLib/X64/CpuId.asm
index 5e7ee19c53..5e7ee19c53 100644
--- a/MdePkg/Library/BaseLib/X64/CpuId.asm
+++ b/OldMdePkg/Library/BaseLib/X64/CpuId.asm
diff --git a/MdePkg/Library/BaseLib/X64/CpuIdEx.S b/OldMdePkg/Library/BaseLib/X64/CpuIdEx.S
index e5317e04cb..e5317e04cb 100644
--- a/MdePkg/Library/BaseLib/X64/CpuIdEx.S
+++ b/OldMdePkg/Library/BaseLib/X64/CpuIdEx.S
diff --git a/MdePkg/Library/BaseLib/X64/CpuIdEx.asm b/OldMdePkg/Library/BaseLib/X64/CpuIdEx.asm
index 450cf543f7..450cf543f7 100644
--- a/MdePkg/Library/BaseLib/X64/CpuIdEx.asm
+++ b/OldMdePkg/Library/BaseLib/X64/CpuIdEx.asm
diff --git a/MdePkg/Library/BaseLib/X64/CpuPause.S b/OldMdePkg/Library/BaseLib/X64/CpuPause.S
index 0ecaa85b61..0ecaa85b61 100644
--- a/MdePkg/Library/BaseLib/X64/CpuPause.S
+++ b/OldMdePkg/Library/BaseLib/X64/CpuPause.S
diff --git a/MdePkg/Library/BaseLib/X64/CpuPause.asm b/OldMdePkg/Library/BaseLib/X64/CpuPause.asm
index d16da37712..d16da37712 100644
--- a/MdePkg/Library/BaseLib/X64/CpuPause.asm
+++ b/OldMdePkg/Library/BaseLib/X64/CpuPause.asm
diff --git a/MdePkg/Library/BaseLib/X64/CpuSleep.S b/OldMdePkg/Library/BaseLib/X64/CpuSleep.S
index 681e4c12c3..681e4c12c3 100644
--- a/MdePkg/Library/BaseLib/X64/CpuSleep.S
+++ b/OldMdePkg/Library/BaseLib/X64/CpuSleep.S
diff --git a/MdePkg/Library/BaseLib/X64/CpuSleep.asm b/OldMdePkg/Library/BaseLib/X64/CpuSleep.asm
index b2c4907032..b2c4907032 100644
--- a/MdePkg/Library/BaseLib/X64/CpuSleep.asm
+++ b/OldMdePkg/Library/BaseLib/X64/CpuSleep.asm
diff --git a/MdePkg/Library/BaseLib/X64/DisableInterrupts.S b/OldMdePkg/Library/BaseLib/X64/DisableInterrupts.S
index da16886b8b..da16886b8b 100644
--- a/MdePkg/Library/BaseLib/X64/DisableInterrupts.S
+++ b/OldMdePkg/Library/BaseLib/X64/DisableInterrupts.S
diff --git a/MdePkg/Library/BaseLib/X64/DisableInterrupts.asm b/OldMdePkg/Library/BaseLib/X64/DisableInterrupts.asm
index 586832c1a2..586832c1a2 100644
--- a/MdePkg/Library/BaseLib/X64/DisableInterrupts.asm
+++ b/OldMdePkg/Library/BaseLib/X64/DisableInterrupts.asm
diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.S b/OldMdePkg/Library/BaseLib/X64/DisablePaging64.S
index d23313de38..d23313de38 100644
--- a/MdePkg/Library/BaseLib/X64/DisablePaging64.S
+++ b/OldMdePkg/Library/BaseLib/X64/DisablePaging64.S
diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.asm b/OldMdePkg/Library/BaseLib/X64/DisablePaging64.asm
index 518137ddc9..518137ddc9 100644
--- a/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
+++ b/OldMdePkg/Library/BaseLib/X64/DisablePaging64.asm
diff --git a/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S b/OldMdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S
index 581b7bb345..581b7bb345 100644
--- a/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S
+++ b/OldMdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S
diff --git a/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.asm b/OldMdePkg/Library/BaseLib/X64/EnableDisableInterrupts.asm
index 0d0400f007..0d0400f007 100644
--- a/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.asm
+++ b/OldMdePkg/Library/BaseLib/X64/EnableDisableInterrupts.asm
diff --git a/MdePkg/Library/BaseLib/X64/EnableInterrupts.S b/OldMdePkg/Library/BaseLib/X64/EnableInterrupts.S
index b81bcd0747..b81bcd0747 100644
--- a/MdePkg/Library/BaseLib/X64/EnableInterrupts.S
+++ b/OldMdePkg/Library/BaseLib/X64/EnableInterrupts.S
diff --git a/MdePkg/Library/BaseLib/X64/EnableInterrupts.asm b/OldMdePkg/Library/BaseLib/X64/EnableInterrupts.asm
index 8fb4adfe37..8fb4adfe37 100644
--- a/MdePkg/Library/BaseLib/X64/EnableInterrupts.asm
+++ b/OldMdePkg/Library/BaseLib/X64/EnableInterrupts.asm
diff --git a/MdePkg/Library/BaseLib/X64/EnablePaging64.S b/OldMdePkg/Library/BaseLib/X64/EnablePaging64.S
index 15209c0030..15209c0030 100644
--- a/MdePkg/Library/BaseLib/X64/EnablePaging64.S
+++ b/OldMdePkg/Library/BaseLib/X64/EnablePaging64.S
diff --git a/MdePkg/Library/BaseLib/X64/EnablePaging64.asm b/OldMdePkg/Library/BaseLib/X64/EnablePaging64.asm
index c54843008a..c54843008a 100644
--- a/MdePkg/Library/BaseLib/X64/EnablePaging64.asm
+++ b/OldMdePkg/Library/BaseLib/X64/EnablePaging64.asm
diff --git a/MdePkg/Library/BaseLib/X64/FlushCacheLine.S b/OldMdePkg/Library/BaseLib/X64/FlushCacheLine.S
index 4c5a52fbf5..4c5a52fbf5 100644
--- a/MdePkg/Library/BaseLib/X64/FlushCacheLine.S
+++ b/OldMdePkg/Library/BaseLib/X64/FlushCacheLine.S
diff --git a/MdePkg/Library/BaseLib/X64/FlushCacheLine.asm b/OldMdePkg/Library/BaseLib/X64/FlushCacheLine.asm
index 83966a691d..83966a691d 100644
--- a/MdePkg/Library/BaseLib/X64/FlushCacheLine.asm
+++ b/OldMdePkg/Library/BaseLib/X64/FlushCacheLine.asm
diff --git a/MdePkg/Library/BaseLib/X64/FxRestore.S b/OldMdePkg/Library/BaseLib/X64/FxRestore.S
index cc9750c57c..cc9750c57c 100644
--- a/MdePkg/Library/BaseLib/X64/FxRestore.S
+++ b/OldMdePkg/Library/BaseLib/X64/FxRestore.S
diff --git a/MdePkg/Library/BaseLib/X64/FxRestore.asm b/OldMdePkg/Library/BaseLib/X64/FxRestore.asm
index 7e7037e9e6..7e7037e9e6 100644
--- a/MdePkg/Library/BaseLib/X64/FxRestore.asm
+++ b/OldMdePkg/Library/BaseLib/X64/FxRestore.asm
diff --git a/MdePkg/Library/BaseLib/X64/FxSave.S b/OldMdePkg/Library/BaseLib/X64/FxSave.S
index 432d7b9c13..432d7b9c13 100644
--- a/MdePkg/Library/BaseLib/X64/FxSave.S
+++ b/OldMdePkg/Library/BaseLib/X64/FxSave.S
diff --git a/MdePkg/Library/BaseLib/X64/FxSave.asm b/OldMdePkg/Library/BaseLib/X64/FxSave.asm
index ea19cd1648..ea19cd1648 100644
--- a/MdePkg/Library/BaseLib/X64/FxSave.asm
+++ b/OldMdePkg/Library/BaseLib/X64/FxSave.asm
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S
index cd85279c73..cd85279c73 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.asm b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.asm
index 55b055453f..55b055453f 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.asm
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.asm
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
index 4a9fe6aca6..4a9fe6aca6 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.c
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S
index ae27964292..ae27964292 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.asm b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.asm
index 88c25a56de..88c25a56de 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.asm
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.asm
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
index bed1dc8972..bed1dc8972 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.c
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.S b/OldMdePkg/Library/BaseLib/X64/InterlockedDecrement.S
index 59ca54bb9f..59ca54bb9f 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.S
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedDecrement.S
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.asm b/OldMdePkg/Library/BaseLib/X64/InterlockedDecrement.asm
index f907fed4a8..f907fed4a8 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.asm
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedDecrement.asm
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c b/OldMdePkg/Library/BaseLib/X64/InterlockedDecrement.c
index 19e6a5dc49..19e6a5dc49 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.c
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedDecrement.c
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.S b/OldMdePkg/Library/BaseLib/X64/InterlockedIncrement.S
index df4cb974b6..df4cb974b6 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.S
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedIncrement.S
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.asm b/OldMdePkg/Library/BaseLib/X64/InterlockedIncrement.asm
index f5a4130bf1..f5a4130bf1 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.asm
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedIncrement.asm
diff --git a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c b/OldMdePkg/Library/BaseLib/X64/InterlockedIncrement.c
index eda9f79a5b..eda9f79a5b 100644
--- a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.c
+++ b/OldMdePkg/Library/BaseLib/X64/InterlockedIncrement.c
diff --git a/MdePkg/Library/BaseLib/X64/Invd.S b/OldMdePkg/Library/BaseLib/X64/Invd.S
index 030ae454e6..030ae454e6 100644
--- a/MdePkg/Library/BaseLib/X64/Invd.S
+++ b/OldMdePkg/Library/BaseLib/X64/Invd.S
diff --git a/MdePkg/Library/BaseLib/X64/Invd.asm b/OldMdePkg/Library/BaseLib/X64/Invd.asm
index 446587923b..446587923b 100644
--- a/MdePkg/Library/BaseLib/X64/Invd.asm
+++ b/OldMdePkg/Library/BaseLib/X64/Invd.asm
diff --git a/MdePkg/Library/BaseLib/X64/LongJump.S b/OldMdePkg/Library/BaseLib/X64/LongJump.S
index 1a6f859c8e..1a6f859c8e 100644
--- a/MdePkg/Library/BaseLib/X64/LongJump.S
+++ b/OldMdePkg/Library/BaseLib/X64/LongJump.S
diff --git a/MdePkg/Library/BaseLib/X64/LongJump.asm b/OldMdePkg/Library/BaseLib/X64/LongJump.asm
index 38e5606081..38e5606081 100644
--- a/MdePkg/Library/BaseLib/X64/LongJump.asm
+++ b/OldMdePkg/Library/BaseLib/X64/LongJump.asm
diff --git a/MdePkg/Library/BaseLib/X64/Monitor.S b/OldMdePkg/Library/BaseLib/X64/Monitor.S
index 13da27d8ad..13da27d8ad 100644
--- a/MdePkg/Library/BaseLib/X64/Monitor.S
+++ b/OldMdePkg/Library/BaseLib/X64/Monitor.S
diff --git a/MdePkg/Library/BaseLib/X64/Monitor.asm b/OldMdePkg/Library/BaseLib/X64/Monitor.asm
index ec9c3f8d03..ec9c3f8d03 100644
--- a/MdePkg/Library/BaseLib/X64/Monitor.asm
+++ b/OldMdePkg/Library/BaseLib/X64/Monitor.asm
diff --git a/MdePkg/Library/BaseLib/X64/Mwait.S b/OldMdePkg/Library/BaseLib/X64/Mwait.S
index a32d004a18..a32d004a18 100644
--- a/MdePkg/Library/BaseLib/X64/Mwait.S
+++ b/OldMdePkg/Library/BaseLib/X64/Mwait.S
diff --git a/MdePkg/Library/BaseLib/X64/Mwait.asm b/OldMdePkg/Library/BaseLib/X64/Mwait.asm
index aae1d42758..aae1d42758 100644
--- a/MdePkg/Library/BaseLib/X64/Mwait.asm
+++ b/OldMdePkg/Library/BaseLib/X64/Mwait.asm
diff --git a/MdePkg/Library/BaseLib/X64/Non-existing.c b/OldMdePkg/Library/BaseLib/X64/Non-existing.c
index 4f0c932380..4f0c932380 100644
--- a/MdePkg/Library/BaseLib/X64/Non-existing.c
+++ b/OldMdePkg/Library/BaseLib/X64/Non-existing.c
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr0.S b/OldMdePkg/Library/BaseLib/X64/ReadCr0.S
index fa916d09fb..fa916d09fb 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr0.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr0.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr0.asm b/OldMdePkg/Library/BaseLib/X64/ReadCr0.asm
index 3e369c3a81..3e369c3a81 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr0.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr0.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr2.S b/OldMdePkg/Library/BaseLib/X64/ReadCr2.S
index 96361bef72..96361bef72 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr2.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr2.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr2.asm b/OldMdePkg/Library/BaseLib/X64/ReadCr2.asm
index 8476f5af18..8476f5af18 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr2.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr2.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr3.S b/OldMdePkg/Library/BaseLib/X64/ReadCr3.S
index 480486f093..480486f093 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr3.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr3.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr3.asm b/OldMdePkg/Library/BaseLib/X64/ReadCr3.asm
index af54d46373..af54d46373 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr3.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr3.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr4.S b/OldMdePkg/Library/BaseLib/X64/ReadCr4.S
index e89b5cdab6..e89b5cdab6 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr4.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr4.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadCr4.asm b/OldMdePkg/Library/BaseLib/X64/ReadCr4.asm
index c8a881db9e..c8a881db9e 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCr4.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCr4.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadCs.S b/OldMdePkg/Library/BaseLib/X64/ReadCs.S
index 677747b813..677747b813 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCs.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCs.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadCs.asm b/OldMdePkg/Library/BaseLib/X64/ReadCs.asm
index 642ce5b169..642ce5b169 100644
--- a/MdePkg/Library/BaseLib/X64/ReadCs.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadCs.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr0.S b/OldMdePkg/Library/BaseLib/X64/ReadDr0.S
index 1b441c344d..1b441c344d 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr0.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr0.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr0.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr0.asm
index 7e0d6b714a..7e0d6b714a 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr0.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr0.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr1.S b/OldMdePkg/Library/BaseLib/X64/ReadDr1.S
index 5151a80d9c..5151a80d9c 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr1.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr1.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr1.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr1.asm
index 22f11c4e0f..22f11c4e0f 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr1.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr1.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr2.S b/OldMdePkg/Library/BaseLib/X64/ReadDr2.S
index f4516afd4d..f4516afd4d 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr2.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr2.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr2.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr2.asm
index 3b81605861..3b81605861 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr2.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr2.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr3.S b/OldMdePkg/Library/BaseLib/X64/ReadDr3.S
index c5c679c96e..c5c679c96e 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr3.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr3.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr3.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr3.asm
index 1968fd0d67..1968fd0d67 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr3.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr3.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr4.S b/OldMdePkg/Library/BaseLib/X64/ReadDr4.S
index f98c9ed35d..f98c9ed35d 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr4.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr4.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr4.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr4.asm
index 2bed12928b..2bed12928b 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr4.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr4.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr5.S b/OldMdePkg/Library/BaseLib/X64/ReadDr5.S
index 421f57a418..421f57a418 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr5.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr5.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr5.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr5.asm
index 3bee3a56ec..3bee3a56ec 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr5.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr5.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr6.S b/OldMdePkg/Library/BaseLib/X64/ReadDr6.S
index 6a159d8762..6a159d8762 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr6.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr6.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr6.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr6.asm
index a3dafb9b9f..a3dafb9b9f 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr6.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr6.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr7.S b/OldMdePkg/Library/BaseLib/X64/ReadDr7.S
index 9ffb09d13a..9ffb09d13a 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr7.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr7.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDr7.asm b/OldMdePkg/Library/BaseLib/X64/ReadDr7.asm
index 0cff14b5c4..0cff14b5c4 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDr7.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDr7.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadDs.S b/OldMdePkg/Library/BaseLib/X64/ReadDs.S
index 58bee11beb..58bee11beb 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDs.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDs.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadDs.asm b/OldMdePkg/Library/BaseLib/X64/ReadDs.asm
index 6f2629872b..6f2629872b 100644
--- a/MdePkg/Library/BaseLib/X64/ReadDs.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadDs.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadEflags.S b/OldMdePkg/Library/BaseLib/X64/ReadEflags.S
index e895387673..e895387673 100644
--- a/MdePkg/Library/BaseLib/X64/ReadEflags.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadEflags.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadEflags.asm b/OldMdePkg/Library/BaseLib/X64/ReadEflags.asm
index 174ae95887..174ae95887 100644
--- a/MdePkg/Library/BaseLib/X64/ReadEflags.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadEflags.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadEs.S b/OldMdePkg/Library/BaseLib/X64/ReadEs.S
index 93df650371..93df650371 100644
--- a/MdePkg/Library/BaseLib/X64/ReadEs.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadEs.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadEs.asm b/OldMdePkg/Library/BaseLib/X64/ReadEs.asm
index d5fe84d73f..d5fe84d73f 100644
--- a/MdePkg/Library/BaseLib/X64/ReadEs.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadEs.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadFs.S b/OldMdePkg/Library/BaseLib/X64/ReadFs.S
index ff658e1248..ff658e1248 100644
--- a/MdePkg/Library/BaseLib/X64/ReadFs.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadFs.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadFs.asm b/OldMdePkg/Library/BaseLib/X64/ReadFs.asm
index d44ee545af..d44ee545af 100644
--- a/MdePkg/Library/BaseLib/X64/ReadFs.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadFs.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadGdtr.S b/OldMdePkg/Library/BaseLib/X64/ReadGdtr.S
index c271a02d78..c271a02d78 100644
--- a/MdePkg/Library/BaseLib/X64/ReadGdtr.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadGdtr.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadGdtr.asm b/OldMdePkg/Library/BaseLib/X64/ReadGdtr.asm
index 0bc2949b54..0bc2949b54 100644
--- a/MdePkg/Library/BaseLib/X64/ReadGdtr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadGdtr.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadGs.S b/OldMdePkg/Library/BaseLib/X64/ReadGs.S
index f92776c35d..f92776c35d 100644
--- a/MdePkg/Library/BaseLib/X64/ReadGs.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadGs.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadGs.asm b/OldMdePkg/Library/BaseLib/X64/ReadGs.asm
index bc5de7691b..bc5de7691b 100644
--- a/MdePkg/Library/BaseLib/X64/ReadGs.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadGs.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadIdtr.S b/OldMdePkg/Library/BaseLib/X64/ReadIdtr.S
index cd7c09e6b7..cd7c09e6b7 100644
--- a/MdePkg/Library/BaseLib/X64/ReadIdtr.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadIdtr.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadIdtr.asm b/OldMdePkg/Library/BaseLib/X64/ReadIdtr.asm
index db684f3671..db684f3671 100644
--- a/MdePkg/Library/BaseLib/X64/ReadIdtr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadIdtr.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadLdtr.S b/OldMdePkg/Library/BaseLib/X64/ReadLdtr.S
index fac8e25d74..fac8e25d74 100644
--- a/MdePkg/Library/BaseLib/X64/ReadLdtr.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadLdtr.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadLdtr.asm b/OldMdePkg/Library/BaseLib/X64/ReadLdtr.asm
index 3d6a2f8843..3d6a2f8843 100644
--- a/MdePkg/Library/BaseLib/X64/ReadLdtr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadLdtr.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm0.S b/OldMdePkg/Library/BaseLib/X64/ReadMm0.S
index b5912ca0b4..b5912ca0b4 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm0.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm0.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm0.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm0.asm
index 0ed5c8f8ae..0ed5c8f8ae 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm0.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm0.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm1.S b/OldMdePkg/Library/BaseLib/X64/ReadMm1.S
index 1f26cd4483..1f26cd4483 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm1.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm1.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm1.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm1.asm
index e24fcb5f9d..e24fcb5f9d 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm1.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm1.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm2.S b/OldMdePkg/Library/BaseLib/X64/ReadMm2.S
index ef864af090..ef864af090 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm2.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm2.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm2.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm2.asm
index 860326b375..860326b375 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm2.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm2.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm3.S b/OldMdePkg/Library/BaseLib/X64/ReadMm3.S
index bd76cb20a2..bd76cb20a2 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm3.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm3.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm3.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm3.asm
index aca6f3d2df..aca6f3d2df 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm3.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm3.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm4.S b/OldMdePkg/Library/BaseLib/X64/ReadMm4.S
index 99d766887c..99d766887c 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm4.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm4.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm4.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm4.asm
index dd52f99436..dd52f99436 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm4.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm4.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm5.S b/OldMdePkg/Library/BaseLib/X64/ReadMm5.S
index 7a01c53ca5..7a01c53ca5 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm5.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm5.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm5.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm5.asm
index 1f30e4bed4..1f30e4bed4 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm5.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm5.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm6.S b/OldMdePkg/Library/BaseLib/X64/ReadMm6.S
index 0c7ea79858..0c7ea79858 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm6.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm6.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm6.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm6.asm
index 4e1f2a824b..4e1f2a824b 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm6.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm6.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm7.S b/OldMdePkg/Library/BaseLib/X64/ReadMm7.S
index 68f1dbdd30..68f1dbdd30 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm7.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm7.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMm7.asm b/OldMdePkg/Library/BaseLib/X64/ReadMm7.asm
index d871a9f8dc..d871a9f8dc 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMm7.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMm7.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.S b/OldMdePkg/Library/BaseLib/X64/ReadMsr64.S
index ac101cd670..ac101cd670 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMsr64.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMsr64.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.asm b/OldMdePkg/Library/BaseLib/X64/ReadMsr64.asm
index 580c0761a4..580c0761a4 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMsr64.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMsr64.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.c b/OldMdePkg/Library/BaseLib/X64/ReadMsr64.c
index 15a573fc09..15a573fc09 100644
--- a/MdePkg/Library/BaseLib/X64/ReadMsr64.c
+++ b/OldMdePkg/Library/BaseLib/X64/ReadMsr64.c
diff --git a/MdePkg/Library/BaseLib/X64/ReadPmc.S b/OldMdePkg/Library/BaseLib/X64/ReadPmc.S
index 115f6335c7..115f6335c7 100644
--- a/MdePkg/Library/BaseLib/X64/ReadPmc.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadPmc.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadPmc.asm b/OldMdePkg/Library/BaseLib/X64/ReadPmc.asm
index 5ca60fa85f..5ca60fa85f 100644
--- a/MdePkg/Library/BaseLib/X64/ReadPmc.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadPmc.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadSs.S b/OldMdePkg/Library/BaseLib/X64/ReadSs.S
index a93a7032cf..a93a7032cf 100644
--- a/MdePkg/Library/BaseLib/X64/ReadSs.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadSs.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadSs.asm b/OldMdePkg/Library/BaseLib/X64/ReadSs.asm
index 2c2be564ac..2c2be564ac 100644
--- a/MdePkg/Library/BaseLib/X64/ReadSs.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadSs.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadTr.S b/OldMdePkg/Library/BaseLib/X64/ReadTr.S
index 5e3146bf27..5e3146bf27 100644
--- a/MdePkg/Library/BaseLib/X64/ReadTr.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadTr.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadTr.asm b/OldMdePkg/Library/BaseLib/X64/ReadTr.asm
index 7cf8cdfd43..7cf8cdfd43 100644
--- a/MdePkg/Library/BaseLib/X64/ReadTr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadTr.asm
diff --git a/MdePkg/Library/BaseLib/X64/ReadTsc.S b/OldMdePkg/Library/BaseLib/X64/ReadTsc.S
index 776ffc2265..776ffc2265 100644
--- a/MdePkg/Library/BaseLib/X64/ReadTsc.S
+++ b/OldMdePkg/Library/BaseLib/X64/ReadTsc.S
diff --git a/MdePkg/Library/BaseLib/X64/ReadTsc.asm b/OldMdePkg/Library/BaseLib/X64/ReadTsc.asm
index 7c45eebd54..7c45eebd54 100644
--- a/MdePkg/Library/BaseLib/X64/ReadTsc.asm
+++ b/OldMdePkg/Library/BaseLib/X64/ReadTsc.asm
diff --git a/MdePkg/Library/BaseLib/X64/SetJump.S b/OldMdePkg/Library/BaseLib/X64/SetJump.S
index eaaa43bf98..eaaa43bf98 100644
--- a/MdePkg/Library/BaseLib/X64/SetJump.S
+++ b/OldMdePkg/Library/BaseLib/X64/SetJump.S
diff --git a/MdePkg/Library/BaseLib/X64/SetJump.asm b/OldMdePkg/Library/BaseLib/X64/SetJump.asm
index 2ed581ea9d..2ed581ea9d 100644
--- a/MdePkg/Library/BaseLib/X64/SetJump.asm
+++ b/OldMdePkg/Library/BaseLib/X64/SetJump.asm
diff --git a/MdePkg/Library/BaseLib/X64/SwitchStack.S b/OldMdePkg/Library/BaseLib/X64/SwitchStack.S
index 85cdb4306d..85cdb4306d 100644
--- a/MdePkg/Library/BaseLib/X64/SwitchStack.S
+++ b/OldMdePkg/Library/BaseLib/X64/SwitchStack.S
diff --git a/MdePkg/Library/BaseLib/X64/SwitchStack.asm b/OldMdePkg/Library/BaseLib/X64/SwitchStack.asm
index 53d1417f0b..53d1417f0b 100644
--- a/MdePkg/Library/BaseLib/X64/SwitchStack.asm
+++ b/OldMdePkg/Library/BaseLib/X64/SwitchStack.asm
diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.S b/OldMdePkg/Library/BaseLib/X64/Thunk16.S
index e69de29bb2..e69de29bb2 100644
--- a/MdePkg/Library/BaseLib/X64/Thunk16.S
+++ b/OldMdePkg/Library/BaseLib/X64/Thunk16.S
diff --git a/MdePkg/Library/BaseLib/X64/Thunk16.asm b/OldMdePkg/Library/BaseLib/X64/Thunk16.asm
index 556a8b47e3..556a8b47e3 100644
--- a/MdePkg/Library/BaseLib/X64/Thunk16.asm
+++ b/OldMdePkg/Library/BaseLib/X64/Thunk16.asm
diff --git a/MdePkg/Library/BaseLib/X64/Wbinvd.S b/OldMdePkg/Library/BaseLib/X64/Wbinvd.S
index a4b9704d2d..a4b9704d2d 100644
--- a/MdePkg/Library/BaseLib/X64/Wbinvd.S
+++ b/OldMdePkg/Library/BaseLib/X64/Wbinvd.S
diff --git a/MdePkg/Library/BaseLib/X64/Wbinvd.asm b/OldMdePkg/Library/BaseLib/X64/Wbinvd.asm
index ca0cb252b3..ca0cb252b3 100644
--- a/MdePkg/Library/BaseLib/X64/Wbinvd.asm
+++ b/OldMdePkg/Library/BaseLib/X64/Wbinvd.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr0.S b/OldMdePkg/Library/BaseLib/X64/WriteCr0.S
index f77dc815bf..f77dc815bf 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr0.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr0.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr0.asm b/OldMdePkg/Library/BaseLib/X64/WriteCr0.asm
index caf1904d2e..caf1904d2e 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr0.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr0.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr2.S b/OldMdePkg/Library/BaseLib/X64/WriteCr2.S
index 66821616e1..66821616e1 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr2.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr2.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr2.asm b/OldMdePkg/Library/BaseLib/X64/WriteCr2.asm
index ee5b546262..ee5b546262 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr2.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr2.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr3.S b/OldMdePkg/Library/BaseLib/X64/WriteCr3.S
index 880ed9737b..880ed9737b 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr3.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr3.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr3.asm b/OldMdePkg/Library/BaseLib/X64/WriteCr3.asm
index e63229820e..e63229820e 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr3.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr3.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr4.S b/OldMdePkg/Library/BaseLib/X64/WriteCr4.S
index 046936352f..046936352f 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr4.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr4.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteCr4.asm b/OldMdePkg/Library/BaseLib/X64/WriteCr4.asm
index 3e79fe23e4..3e79fe23e4 100644
--- a/MdePkg/Library/BaseLib/X64/WriteCr4.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteCr4.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr0.S b/OldMdePkg/Library/BaseLib/X64/WriteDr0.S
index 080e56aeb5..080e56aeb5 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr0.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr0.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr0.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr0.asm
index a1131fead9..a1131fead9 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr0.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr0.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr1.S b/OldMdePkg/Library/BaseLib/X64/WriteDr1.S
index af61b68e88..af61b68e88 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr1.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr1.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr1.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr1.asm
index 366edb6ef8..366edb6ef8 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr1.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr1.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr2.S b/OldMdePkg/Library/BaseLib/X64/WriteDr2.S
index a9e5369175..a9e5369175 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr2.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr2.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr2.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr2.asm
index bde8e3d929..bde8e3d929 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr2.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr2.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr3.S b/OldMdePkg/Library/BaseLib/X64/WriteDr3.S
index 04017cc886..04017cc886 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr3.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr3.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr3.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr3.asm
index 65180a27d5..65180a27d5 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr3.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr3.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr4.S b/OldMdePkg/Library/BaseLib/X64/WriteDr4.S
index b6b4e7821c..b6b4e7821c 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr4.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr4.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr4.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr4.asm
index 188a9d4ddc..188a9d4ddc 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr4.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr4.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr5.S b/OldMdePkg/Library/BaseLib/X64/WriteDr5.S
index 7539095890..7539095890 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr5.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr5.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr5.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr5.asm
index 86009c3287..86009c3287 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr5.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr5.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr6.S b/OldMdePkg/Library/BaseLib/X64/WriteDr6.S
index 862726079e..862726079e 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr6.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr6.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr6.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr6.asm
index f1ddae8bfc..f1ddae8bfc 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr6.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr6.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr7.S b/OldMdePkg/Library/BaseLib/X64/WriteDr7.S
index 8699d9536f..8699d9536f 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr7.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr7.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr7.asm b/OldMdePkg/Library/BaseLib/X64/WriteDr7.asm
index 6a0cbfa6ff..6a0cbfa6ff 100644
--- a/MdePkg/Library/BaseLib/X64/WriteDr7.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteDr7.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteGdtr.S b/OldMdePkg/Library/BaseLib/X64/WriteGdtr.S
index 1e9d84b426..1e9d84b426 100644
--- a/MdePkg/Library/BaseLib/X64/WriteGdtr.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteGdtr.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteGdtr.asm b/OldMdePkg/Library/BaseLib/X64/WriteGdtr.asm
index fa99a499e7..fa99a499e7 100644
--- a/MdePkg/Library/BaseLib/X64/WriteGdtr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteGdtr.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteIdtr.S b/OldMdePkg/Library/BaseLib/X64/WriteIdtr.S
index feb085ff58..feb085ff58 100644
--- a/MdePkg/Library/BaseLib/X64/WriteIdtr.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteIdtr.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteIdtr.asm b/OldMdePkg/Library/BaseLib/X64/WriteIdtr.asm
index 2f6c081ab6..2f6c081ab6 100644
--- a/MdePkg/Library/BaseLib/X64/WriteIdtr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteIdtr.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteLdtr.S b/OldMdePkg/Library/BaseLib/X64/WriteLdtr.S
index c07ab831f9..c07ab831f9 100644
--- a/MdePkg/Library/BaseLib/X64/WriteLdtr.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteLdtr.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteLdtr.asm b/OldMdePkg/Library/BaseLib/X64/WriteLdtr.asm
index d85ae38f29..d85ae38f29 100644
--- a/MdePkg/Library/BaseLib/X64/WriteLdtr.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteLdtr.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm0.S b/OldMdePkg/Library/BaseLib/X64/WriteMm0.S
index 2d805a14dc..2d805a14dc 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm0.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm0.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm0.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm0.asm
index 7496362d86..7496362d86 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm0.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm0.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm1.S b/OldMdePkg/Library/BaseLib/X64/WriteMm1.S
index ff8162e727..ff8162e727 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm1.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm1.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm1.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm1.asm
index a00f551f8a..a00f551f8a 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm1.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm1.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm2.S b/OldMdePkg/Library/BaseLib/X64/WriteMm2.S
index a98e73650c..a98e73650c 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm2.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm2.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm2.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm2.asm
index 01db79007d..01db79007d 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm2.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm2.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm3.S b/OldMdePkg/Library/BaseLib/X64/WriteMm3.S
index 81561e3594..81561e3594 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm3.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm3.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm3.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm3.asm
index 59464641eb..59464641eb 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm3.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm3.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm4.S b/OldMdePkg/Library/BaseLib/X64/WriteMm4.S
index 124d946dde..124d946dde 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm4.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm4.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm4.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm4.asm
index 6848dbf7ec..6848dbf7ec 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm4.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm4.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm5.S b/OldMdePkg/Library/BaseLib/X64/WriteMm5.S
index 0935ddc0b1..0935ddc0b1 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm5.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm5.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm5.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm5.asm
index fbe44ae078..fbe44ae078 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm5.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm5.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm6.S b/OldMdePkg/Library/BaseLib/X64/WriteMm6.S
index 02b50cf055..02b50cf055 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm6.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm6.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm6.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm6.asm
index cd5938828d..cd5938828d 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm6.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm6.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm7.S b/OldMdePkg/Library/BaseLib/X64/WriteMm7.S
index 60292721e8..60292721e8 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm7.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm7.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm7.asm b/OldMdePkg/Library/BaseLib/X64/WriteMm7.asm
index 9636a4cd8d..9636a4cd8d 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMm7.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMm7.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMsr64.S b/OldMdePkg/Library/BaseLib/X64/WriteMsr64.S
index 88ff48bf26..88ff48bf26 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMsr64.S
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMsr64.S
diff --git a/MdePkg/Library/BaseLib/X64/WriteMsr64.asm b/OldMdePkg/Library/BaseLib/X64/WriteMsr64.asm
index b7704b8185..b7704b8185 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMsr64.asm
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMsr64.asm
diff --git a/MdePkg/Library/BaseLib/X64/WriteMsr64.c b/OldMdePkg/Library/BaseLib/X64/WriteMsr64.c
index 1d1e0bc332..1d1e0bc332 100644
--- a/MdePkg/Library/BaseLib/X64/WriteMsr64.c
+++ b/OldMdePkg/Library/BaseLib/X64/WriteMsr64.c
diff --git a/MdePkg/Library/BaseLib/x86DisablePaging32.c b/OldMdePkg/Library/BaseLib/x86DisablePaging32.c
index 417a7794bb..417a7794bb 100644
--- a/MdePkg/Library/BaseLib/x86DisablePaging32.c
+++ b/OldMdePkg/Library/BaseLib/x86DisablePaging32.c
diff --git a/MdePkg/Library/BaseLib/x86DisablePaging64.c b/OldMdePkg/Library/BaseLib/x86DisablePaging64.c
index 18496522ca..18496522ca 100644
--- a/MdePkg/Library/BaseLib/x86DisablePaging64.c
+++ b/OldMdePkg/Library/BaseLib/x86DisablePaging64.c
diff --git a/MdePkg/Library/BaseLib/x86EnablePaging32.c b/OldMdePkg/Library/BaseLib/x86EnablePaging32.c
index f186146940..f186146940 100644
--- a/MdePkg/Library/BaseLib/x86EnablePaging32.c
+++ b/OldMdePkg/Library/BaseLib/x86EnablePaging32.c
diff --git a/MdePkg/Library/BaseLib/x86EnablePaging64.c b/OldMdePkg/Library/BaseLib/x86EnablePaging64.c
index 424568d0f7..424568d0f7 100644
--- a/MdePkg/Library/BaseLib/x86EnablePaging64.c
+++ b/OldMdePkg/Library/BaseLib/x86EnablePaging64.c
diff --git a/MdePkg/Library/BaseLib/x86FxRestore.c b/OldMdePkg/Library/BaseLib/x86FxRestore.c
index 70a0c24025..70a0c24025 100644
--- a/MdePkg/Library/BaseLib/x86FxRestore.c
+++ b/OldMdePkg/Library/BaseLib/x86FxRestore.c
diff --git a/MdePkg/Library/BaseLib/x86FxSave.c b/OldMdePkg/Library/BaseLib/x86FxSave.c
index 18c329195c..18c329195c 100644
--- a/MdePkg/Library/BaseLib/x86FxSave.c
+++ b/OldMdePkg/Library/BaseLib/x86FxSave.c
diff --git a/MdePkg/Library/BaseLib/x86GetInterruptState.c b/OldMdePkg/Library/BaseLib/x86GetInterruptState.c
index 2e06efbc83..2e06efbc83 100644
--- a/MdePkg/Library/BaseLib/x86GetInterruptState.c
+++ b/OldMdePkg/Library/BaseLib/x86GetInterruptState.c
diff --git a/MdePkg/Library/BaseLib/x86MemoryFence.c b/OldMdePkg/Library/BaseLib/x86MemoryFence.c
index 96b1bf26c5..96b1bf26c5 100644
--- a/MdePkg/Library/BaseLib/x86MemoryFence.c
+++ b/OldMdePkg/Library/BaseLib/x86MemoryFence.c
diff --git a/MdePkg/Library/BaseLib/x86Msr.c b/OldMdePkg/Library/BaseLib/x86Msr.c
index aa8e25b83a..aa8e25b83a 100644
--- a/MdePkg/Library/BaseLib/x86Msr.c
+++ b/OldMdePkg/Library/BaseLib/x86Msr.c
diff --git a/MdePkg/Library/BaseLib/x86ReadGdtr.c b/OldMdePkg/Library/BaseLib/x86ReadGdtr.c
index 20d41c0217..20d41c0217 100644
--- a/MdePkg/Library/BaseLib/x86ReadGdtr.c
+++ b/OldMdePkg/Library/BaseLib/x86ReadGdtr.c
diff --git a/MdePkg/Library/BaseLib/x86ReadIdtr.c b/OldMdePkg/Library/BaseLib/x86ReadIdtr.c
index f902b0c11b..f902b0c11b 100644
--- a/MdePkg/Library/BaseLib/x86ReadIdtr.c
+++ b/OldMdePkg/Library/BaseLib/x86ReadIdtr.c
diff --git a/MdePkg/Library/BaseLib/x86Thunk.c b/OldMdePkg/Library/BaseLib/x86Thunk.c
index c74962afc7..c74962afc7 100644
--- a/MdePkg/Library/BaseLib/x86Thunk.c
+++ b/OldMdePkg/Library/BaseLib/x86Thunk.c
diff --git a/MdePkg/Library/BaseLib/x86WriteGdtr.c b/OldMdePkg/Library/BaseLib/x86WriteGdtr.c
index c3df563d57..c3df563d57 100644
--- a/MdePkg/Library/BaseLib/x86WriteGdtr.c
+++ b/OldMdePkg/Library/BaseLib/x86WriteGdtr.c
diff --git a/MdePkg/Library/BaseLib/x86WriteIdtr.c b/OldMdePkg/Library/BaseLib/x86WriteIdtr.c
index cfe6758584..cfe6758584 100644
--- a/MdePkg/Library/BaseLib/x86WriteIdtr.c
+++ b/OldMdePkg/Library/BaseLib/x86WriteIdtr.c
diff --git a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa b/OldMdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
index 52fe3bbfba..52fe3bbfba 100644
--- a/MdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
+++ b/OldMdePkg/Library/BaseMemoryLib/BaseMemoryLib.msa
diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/OldMdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
index 4c0d3eaadb..4c0d3eaadb 100644
--- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/CopyMem.c b/OldMdePkg/Library/BaseMemoryLib/CopyMem.c
index 632061a668..632061a668 100644
--- a/MdePkg/Library/BaseMemoryLib/CopyMem.c
+++ b/OldMdePkg/Library/BaseMemoryLib/CopyMem.c
diff --git a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c b/OldMdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
index 9e620e2200..9e620e2200 100644
--- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c b/OldMdePkg/Library/BaseMemoryLib/MemLibGeneric.c
index 759377483c..759377483c 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
+++ b/OldMdePkg/Library/BaseMemoryLib/MemLibGeneric.c
diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/OldMdePkg/Library/BaseMemoryLib/MemLibGuid.c
index 36da5b7424..36da5b7424 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ b/OldMdePkg/Library/BaseMemoryLib/MemLibGuid.c
diff --git a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h b/OldMdePkg/Library/BaseMemoryLib/MemLibInternals.h
index 8646b24e79..8646b24e79 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
+++ b/OldMdePkg/Library/BaseMemoryLib/MemLibInternals.h
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index 95f134bbda..95f134bbda 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index 6a3dcd7ad2..6a3dcd7ad2 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index b355fe647c..b355fe647c 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
index 2b21b22166..2b21b22166 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem.c b/OldMdePkg/Library/BaseMemoryLib/SetMem.c
index d051f2d63b..d051f2d63b 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem.c
+++ b/OldMdePkg/Library/BaseMemoryLib/SetMem.c
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index 889339c953..889339c953 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index 15f8205ebc..15f8205ebc 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
index 981a7d4731..981a7d4731 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/OldMdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index e74ce8d65b..e74ce8d65b 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/SetMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/OldMdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 90e607c0ce..90e607c0ce 100644
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa b/OldMdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
index 8b071c9a0f..8b071c9a0f 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
diff --git a/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
index 4c0d3eaadb..4c0d3eaadb 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
index 9e620e2200..9e620e2200 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
index 725367b2f9..725367b2f9 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
index 1d0e7fad39..1d0e7fad39 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S
index 349356fb1f..349356fb1f 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm
index 1b8b3c5dcd..1b8b3c5dcd 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/CopyMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S
index 5e65b9667a..5e65b9667a 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
index 57fab61b77..57fab61b77 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S
index 5d46ed2bc1..5d46ed2bc1 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
index 6ac857ce16..6ac857ce16 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S
index 3ba69650ab..3ba69650ab 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
index ca54f13738..ca54f13738 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S
index 7a834a5635..7a834a5635 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
index a3f65b64fa..a3f65b64fa 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S
index 96fb48eedc..96fb48eedc 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm
index c9c48ecf9d..c9c48ecf9d 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S
index 9dece46b02..9dece46b02 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm
index e934226658..e934226658 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S
index 7505ea53d3..7505ea53d3 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm
index c2e4869e47..c2e4869e47 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S
index 8c12c421dc..8c12c421dc 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
index 027483ba3f..027483ba3f 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/SetMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S
index 8c52a3c950..8c52a3c950 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm
index a75480bd40..a75480bd40 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/Ia32/ZeroMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c b/OldMdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
index 36da5b7424..36da5b7424 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h b/OldMdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h
index 8646b24e79..8646b24e79 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h
diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
index 95f134bbda..95f134bbda 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
index 6a3dcd7ad2..6a3dcd7ad2 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
index b355fe647c..b355fe647c 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
index 2b21b22166..2b21b22166 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
index 889339c953..889339c953 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
index 15f8205ebc..15f8205ebc 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
index 981a7d4731..981a7d4731 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
index e74ce8d65b..e74ce8d65b 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
index fb1dccee0b..fb1dccee0b 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
index 554bc07c64..554bc07c64 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S
index c4ecdc70eb..c4ecdc70eb 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.S
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm
index b57192edbe..b57192edbe 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/CopyMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
index a2538c2cca..a2538c2cca 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
index e0523d8547..e0523d8547 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
index 0e7e9c782f..0e7e9c782f 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
index 879273f960..879273f960 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm
index 923beef6c1..923beef6c1 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm
index 01b72c55d5..01b72c55d5 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm
index 89cf175608..89cf175608 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm
index 454d6234bf..454d6234bf 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/SetMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm
index e9035a3c14..e9035a3c14 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/X64/ZeroMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
index 90e607c0ce..90e607c0ce 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa b/OldMdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
index 0d98031313..0d98031313 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index 4c0d3eaadb..4c0d3eaadb 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
index 9e620e2200..9e620e2200 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
index 725367b2f9..725367b2f9 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
index 1d0e7fad39..1d0e7fad39 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S
index a95b33759c..a95b33759c 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
index 86677ef614..86677ef614 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/CopyMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
index 5e65b9667a..5e65b9667a 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
index 57fab61b77..57fab61b77 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
index 5d46ed2bc1..5d46ed2bc1 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
index 6ac857ce16..6ac857ce16 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
index 3ba69650ab..3ba69650ab 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
index ca54f13738..ca54f13738 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
index 7a834a5635..7a834a5635 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
index a3f65b64fa..a3f65b64fa 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
index 4ddf6c490b..4ddf6c490b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
index 98b1ed84c2..98b1ed84c2 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.S
index 6e7c136222..6e7c136222 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
index 7f4a8955f9..7f4a8955f9 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.S
index 455af20573..455af20573 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
index 5876f4a741..5876f4a741 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.S
index b4afff0fd4..b4afff0fd4 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
index 687c18f312..687c18f312 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/SetMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.S b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.S
index 8465d7cf65..8465d7cf65 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.S
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
index b3b8b5d1f1..b3b8b5d1f1 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/Ia32/ZeroMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/OldMdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index 6f50340bd7..6f50340bd7 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h b/OldMdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
index 8646b24e79..8646b24e79 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index 95f134bbda..95f134bbda 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index 6a3dcd7ad2..6a3dcd7ad2 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index b355fe647c..b355fe647c 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index 2b21b22166..2b21b22166 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
index 889339c953..889339c953 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
index 15f8205ebc..15f8205ebc 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index 981a7d4731..981a7d4731 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index e74ce8d65b..e74ce8d65b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
index 90e607c0ce..90e607c0ce 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
index 554bc07c64..554bc07c64 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/CopyMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/CopyMem.asm
index a2e04056fd..a2e04056fd 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/CopyMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/CopyMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
index a2538c2cca..a2538c2cca 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
index e0523d8547..e0523d8547 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
index 0e7e9c782f..0e7e9c782f 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
index 879273f960..879273f960 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem.asm
index 5306520169..5306520169 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem16.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem16.asm
index fce9ed7ed5..fce9ed7ed5 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem32.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem32.asm
index ce9e54da85..ce9e54da85 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem64.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem64.asm
index 97884a36fe..97884a36fe 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/SetMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/SetMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ZeroMem.asm b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ZeroMem.asm
index c01af8e6e4..c01af8e6e4 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ZeroMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibRepStr/x64/ZeroMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa b/OldMdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
index 5415b3db95..5415b3db95 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
index 4c0d3eaadb..4c0d3eaadb 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
index 9e620e2200..9e620e2200 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
index 725367b2f9..725367b2f9 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index 1d0e7fad39..1d0e7fad39 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
index ddbcbaf1b1..ddbcbaf1b1 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
index 77fb786d98..77fb786d98 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
index 5e65b9667a..5e65b9667a 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
index 57fab61b77..57fab61b77 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
index 5d46ed2bc1..5d46ed2bc1 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
index 6ac857ce16..6ac857ce16 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
index 3ba69650ab..3ba69650ab 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
index ca54f13738..ca54f13738 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
index 7a834a5635..7a834a5635 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
index a3f65b64fa..a3f65b64fa 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
index 86bba889f2..86bba889f2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
index a4de29c521..a4de29c521 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
index 8ec96a9b6c..8ec96a9b6c 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
index a709899fe2..a709899fe2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
index f91169a6e0..f91169a6e0 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
index 99954a5e4b..99954a5e4b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
index ef9918f0f9..ef9918f0f9 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
index 69406707a6..69406707a6 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
index 8b4157f741..8b4157f741 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
index 3792c88879..3792c88879 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/OldMdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index 6f50340bd7..6f50340bd7 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h b/OldMdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
index 8646b24e79..8646b24e79 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index 95f134bbda..95f134bbda 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
index 6a3dcd7ad2..6a3dcd7ad2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
index b355fe647c..b355fe647c 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
index 2b21b22166..2b21b22166 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
index 889339c953..889339c953 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
index 15f8205ebc..15f8205ebc 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
index 981a7d4731..981a7d4731 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index e74ce8d65b..e74ce8d65b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/OldMdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index 90e607c0ce..90e607c0ce 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
index 554bc07c64..554bc07c64 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm
index 03ffe0c00f..03ffe0c00f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
index a2538c2cca..a2538c2cca 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
index e0523d8547..e0523d8547 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
index 0e7e9c782f..0e7e9c782f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
index 879273f960..879273f960 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm
index 25cfcf0d12..25cfcf0d12 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm
index 77b8cf43aa..77b8cf43aa 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm
index eba29bb88d..eba29bb88d 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
index a26b9412d4..a26b9412d4 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm
index 7eebd3a8ef..7eebd3a8ef 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm
+++ b/OldMdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm
diff --git a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa b/OldMdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
index 4537f602c3..4537f602c3 100644
--- a/MdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
+++ b/OldMdePkg/Library/BasePcdLibNull/BasePcdLibNull.msa
diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/OldMdePkg/Library/BasePcdLibNull/PcdLib.c
index ab6f711a00..ab6f711a00 100644
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/OldMdePkg/Library/BasePcdLibNull/PcdLib.c
diff --git a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa b/OldMdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
index aa6309b269..aa6309b269 100644
--- a/MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
+++ b/OldMdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.msa
diff --git a/MdePkg/Library/BasePciCf8Lib/PciLib.c b/OldMdePkg/Library/BasePciCf8Lib/PciLib.c
index 272d641ff3..272d641ff3 100644
--- a/MdePkg/Library/BasePciCf8Lib/PciLib.c
+++ b/OldMdePkg/Library/BasePciCf8Lib/PciLib.c
diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/OldMdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
index cd46cc6922..cd46cc6922 100644
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
+++ b/OldMdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
diff --git a/MdePkg/Library/BasePciExpressLib/PciLib.c b/OldMdePkg/Library/BasePciExpressLib/PciLib.c
index 9cdac21096..9cdac21096 100644
--- a/MdePkg/Library/BasePciExpressLib/PciLib.c
+++ b/OldMdePkg/Library/BasePciExpressLib/PciLib.c
diff --git a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa b/OldMdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
index 85edbbabd7..85edbbabd7 100644
--- a/MdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
+++ b/OldMdePkg/Library/BasePciLibCf8/BasePciLibCf8.msa
diff --git a/MdePkg/Library/BasePciLibCf8/PciLib.c b/OldMdePkg/Library/BasePciLibCf8/PciLib.c
index 7e21e23174..7e21e23174 100644
--- a/MdePkg/Library/BasePciLibCf8/PciLib.c
+++ b/OldMdePkg/Library/BasePciLibCf8/PciLib.c
diff --git a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa b/OldMdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
index b39faa8410..b39faa8410 100644
--- a/MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
+++ b/OldMdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.msa
diff --git a/MdePkg/Library/BasePciLibPciExpress/PciLib.c b/OldMdePkg/Library/BasePciLibPciExpress/PciLib.c
index 1b543da3aa..1b543da3aa 100644
--- a/MdePkg/Library/BasePciLibPciExpress/PciLib.c
+++ b/OldMdePkg/Library/BasePciLibPciExpress/PciLib.c
diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa b/OldMdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
index 5512f6cfbf..5512f6cfbf 100644
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
+++ b/OldMdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.msa
diff --git a/MdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/OldMdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index ab60297776..ab60297776 100644
--- a/MdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/OldMdePkg/Library/BasePeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/OldMdePkg/Library/BasePeCoffLib/BasePeCoff.c
index ad3635f2fb..ad3635f2fb 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/OldMdePkg/Library/BasePeCoffLib/BasePeCoff.c
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa b/OldMdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
index b3d754d570..b3d754d570 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
+++ b/OldMdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h b/OldMdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
index 3d4d71af33..3d4d71af33 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
+++ b/OldMdePkg/Library/BasePeCoffLib/BasePeCoffLibInternals.h
diff --git a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c b/OldMdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
index 4289d0bb95..4289d0bb95 100644
--- a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
+++ b/OldMdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
diff --git a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c b/OldMdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
index 9515a09f4d..9515a09f4d 100644
--- a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
+++ b/OldMdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
diff --git a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c b/OldMdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
index 065aec42ac..065aec42ac 100644
--- a/MdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
+++ b/OldMdePkg/Library/BasePeCoffLib/Ipf/PeCoffLoaderEx.c
diff --git a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c b/OldMdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
index a8d9f23e8c..a8d9f23e8c 100644
--- a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
+++ b/OldMdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
diff --git a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa b/OldMdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
index 0026b44e1a..0026b44e1a 100644
--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
+++ b/OldMdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
diff --git a/MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c b/OldMdePkg/Library/BasePerformanceLibNull/PerformanceLib.c
index b08617c3cc..b08617c3cc 100644
--- a/MdePkg/Library/BasePerformanceLibNull/PerformanceLib.c
+++ b/OldMdePkg/Library/BasePerformanceLibNull/PerformanceLib.c
diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa b/OldMdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
index f4095f38dc..f4095f38dc 100644
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
+++ b/OldMdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
diff --git a/MdePkg/Library/BasePostCodeLibDebug/PostCode.c b/OldMdePkg/Library/BasePostCodeLibDebug/PostCode.c
index a4996d326a..a4996d326a 100644
--- a/MdePkg/Library/BasePostCodeLibDebug/PostCode.c
+++ b/OldMdePkg/Library/BasePostCodeLibDebug/PostCode.c
diff --git a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa b/OldMdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
index 7677762c55..7677762c55 100644
--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
+++ b/OldMdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.msa
diff --git a/MdePkg/Library/BasePostCodeLibPort80/PostCode.c b/OldMdePkg/Library/BasePostCodeLibPort80/PostCode.c
index 3dfd024c2d..3dfd024c2d 100644
--- a/MdePkg/Library/BasePostCodeLibPort80/PostCode.c
+++ b/OldMdePkg/Library/BasePostCodeLibPort80/PostCode.c
diff --git a/MdePkg/Library/BasePrintLib/BasePrintLib.msa b/OldMdePkg/Library/BasePrintLib/BasePrintLib.msa
index 6e6865aa4a..6e6865aa4a 100644
--- a/MdePkg/Library/BasePrintLib/BasePrintLib.msa
+++ b/OldMdePkg/Library/BasePrintLib/BasePrintLib.msa
diff --git a/MdePkg/Library/BasePrintLib/PrintLib.c b/OldMdePkg/Library/BasePrintLib/PrintLib.c
index 02725586e5..02725586e5 100644
--- a/MdePkg/Library/BasePrintLib/PrintLib.c
+++ b/OldMdePkg/Library/BasePrintLib/PrintLib.c
diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/OldMdePkg/Library/BasePrintLib/PrintLibInternal.c
index 675e2a80e2..675e2a80e2 100644
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/OldMdePkg/Library/BasePrintLib/PrintLibInternal.c
diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.h b/OldMdePkg/Library/BasePrintLib/PrintLibInternal.h
index 4482cc266c..4482cc266c 100644
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.h
+++ b/OldMdePkg/Library/BasePrintLib/PrintLibInternal.h
diff --git a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa b/OldMdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
index 6861a9faac..6861a9faac 100644
--- a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
+++ b/OldMdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
diff --git a/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c b/OldMdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
index 0d76072776..0d76072776 100644
--- a/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
+++ b/OldMdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c b/OldMdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
index e70dc88ef1..e70dc88ef1 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
+++ b/OldMdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa b/OldMdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
index f8bfc3f754..f8bfc3f754 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
+++ b/OldMdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.msa
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h b/OldMdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
index 70ae3f2974..70ae3f2974 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
+++ b/OldMdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c b/OldMdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c
index a6f04dfe2f..a6f04dfe2f 100644
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c
+++ b/OldMdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.c
diff --git a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa b/OldMdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa
index 787a36f80c..787a36f80c 100644
--- a/MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa
+++ b/OldMdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa
diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa b/OldMdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
index 1de375e020..1de375e020 100644
--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
+++ b/OldMdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.msa
diff --git a/MdePkg/Library/DxeCoreHobLib/HobLib.c b/OldMdePkg/Library/DxeCoreHobLib/HobLib.c
index 6bf6749bf7..6bf6749bf7 100644
--- a/MdePkg/Library/DxeCoreHobLib/HobLib.c
+++ b/OldMdePkg/Library/DxeCoreHobLib/HobLib.c
diff --git a/MdePkg/Library/DxeCoreHobLib/HobLib.h b/OldMdePkg/Library/DxeCoreHobLib/HobLib.h
index 8f0347639c..8f0347639c 100644
--- a/MdePkg/Library/DxeCoreHobLib/HobLib.h
+++ b/OldMdePkg/Library/DxeCoreHobLib/HobLib.h
diff --git a/MdePkg/Library/DxeHobLib/DxeHobLib.msa b/OldMdePkg/Library/DxeHobLib/DxeHobLib.msa
index b42203066d..b42203066d 100644
--- a/MdePkg/Library/DxeHobLib/DxeHobLib.msa
+++ b/OldMdePkg/Library/DxeHobLib/DxeHobLib.msa
diff --git a/MdePkg/Library/DxeHobLib/HobLib.c b/OldMdePkg/Library/DxeHobLib/HobLib.c
index 672dd3e468..672dd3e468 100644
--- a/MdePkg/Library/DxeHobLib/HobLib.c
+++ b/OldMdePkg/Library/DxeHobLib/HobLib.c
diff --git a/MdePkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h b/OldMdePkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
index 11a5f6eeb8..11a5f6eeb8 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
+++ b/OldMdePkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
diff --git a/MdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa b/OldMdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
index 0ee234ec26..0ee234ec26 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
+++ b/OldMdePkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.msa
diff --git a/MdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c b/OldMdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c
index ed09b4e5aa..ed09b4e5aa 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c
+++ b/OldMdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c
diff --git a/MdePkg/Library/DxeIoLibCpuIo/IoLib.c b/OldMdePkg/Library/DxeIoLibCpuIo/IoLib.c
index 64ba3480ef..64ba3480ef 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/OldMdePkg/Library/DxeIoLibCpuIo/IoLib.c
diff --git a/MdePkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c b/OldMdePkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
index b8e6d83665..b8e6d83665 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
+++ b/OldMdePkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa b/OldMdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
index cb4cd7de94..cb4cd7de94 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
+++ b/OldMdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.msa
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c b/OldMdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
index f67473af66..f67473af66 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
+++ b/OldMdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
diff --git a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h b/OldMdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
index 1234e2e6c7..1234e2e6c7 100644
--- a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
+++ b/OldMdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLibInternals.h
diff --git a/MdePkg/Library/DxeMemoryLib/CompareMemWrapper.c b/OldMdePkg/Library/DxeMemoryLib/CompareMemWrapper.c
index 4c0d3eaadb..4c0d3eaadb 100644
--- a/MdePkg/Library/DxeMemoryLib/CompareMemWrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/CompareMemWrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/CopyMemWrapper.c b/OldMdePkg/Library/DxeMemoryLib/CopyMemWrapper.c
index 9e620e2200..9e620e2200 100644
--- a/MdePkg/Library/DxeMemoryLib/CopyMemWrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/CopyMemWrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa b/OldMdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa
index 1cd1aed64b..1cd1aed64b 100644
--- a/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa
+++ b/OldMdePkg/Library/DxeMemoryLib/DxeMemoryLib.msa
diff --git a/MdePkg/Library/DxeMemoryLib/MemLib.c b/OldMdePkg/Library/DxeMemoryLib/MemLib.c
index 37182db2b5..37182db2b5 100644
--- a/MdePkg/Library/DxeMemoryLib/MemLib.c
+++ b/OldMdePkg/Library/DxeMemoryLib/MemLib.c
diff --git a/MdePkg/Library/DxeMemoryLib/MemLibGeneric.c b/OldMdePkg/Library/DxeMemoryLib/MemLibGeneric.c
index 759377483c..759377483c 100644
--- a/MdePkg/Library/DxeMemoryLib/MemLibGeneric.c
+++ b/OldMdePkg/Library/DxeMemoryLib/MemLibGeneric.c
diff --git a/MdePkg/Library/DxeMemoryLib/MemLibGuid.c b/OldMdePkg/Library/DxeMemoryLib/MemLibGuid.c
index 36da5b7424..36da5b7424 100644
--- a/MdePkg/Library/DxeMemoryLib/MemLibGuid.c
+++ b/OldMdePkg/Library/DxeMemoryLib/MemLibGuid.c
diff --git a/MdePkg/Library/DxeMemoryLib/MemLibInternals.h b/OldMdePkg/Library/DxeMemoryLib/MemLibInternals.h
index 8646b24e79..8646b24e79 100644
--- a/MdePkg/Library/DxeMemoryLib/MemLibInternals.h
+++ b/OldMdePkg/Library/DxeMemoryLib/MemLibInternals.h
diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c
index 95f134bbda..95f134bbda 100644
--- a/MdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c
index 6a3dcd7ad2..6a3dcd7ad2 100644
--- a/MdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c
index b355fe647c..b355fe647c 100644
--- a/MdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c
index 2b21b22166..2b21b22166 100644
--- a/MdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c
index 889339c953..889339c953 100644
--- a/MdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c
index 15f8205ebc..15f8205ebc 100644
--- a/MdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c b/OldMdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c
index 981a7d4731..981a7d4731 100644
--- a/MdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/SetMemWrapper.c b/OldMdePkg/Library/DxeMemoryLib/SetMemWrapper.c
index e74ce8d65b..e74ce8d65b 100644
--- a/MdePkg/Library/DxeMemoryLib/SetMemWrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/SetMemWrapper.c
diff --git a/MdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c b/OldMdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c
index 90e607c0ce..90e607c0ce 100644
--- a/MdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c
+++ b/OldMdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c
diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/OldMdePkg/Library/DxePcdLib/DxePcdLib.c
index 7f502b4253..7f502b4253 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/OldMdePkg/Library/DxePcdLib/DxePcdLib.c
diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.msa b/OldMdePkg/Library/DxePcdLib/DxePcdLib.msa
index 6f95e2e303..6f95e2e303 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.msa
+++ b/OldMdePkg/Library/DxePcdLib/DxePcdLib.msa
diff --git a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa b/OldMdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
index 3014952e51..3014952e51 100644
--- a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
+++ b/OldMdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
diff --git a/MdePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/OldMdePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index 28649f72cc..28649f72cc 100644
--- a/MdePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/OldMdePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c b/OldMdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
index af19099def..af19099def 100644
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
+++ b/OldMdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.c
diff --git a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa b/OldMdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
index 83df67e218..83df67e218 100644
--- a/MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
+++ b/OldMdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.msa
diff --git a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.c b/OldMdePkg/Library/DxeSmbusLib/DxeSmbusLib.c
index 2991350e24..2991350e24 100644
--- a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.c
+++ b/OldMdePkg/Library/DxeSmbusLib/DxeSmbusLib.c
diff --git a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa b/OldMdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
index 39b923a520..39b923a520 100644
--- a/MdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
+++ b/OldMdePkg/Library/DxeSmbusLib/DxeSmbusLib.msa
diff --git a/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h b/OldMdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
index 47c00a7306..47c00a7306 100644
--- a/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
+++ b/OldMdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
diff --git a/MdePkg/Library/DxeSmbusLib/SmbusLib.c b/OldMdePkg/Library/DxeSmbusLib/SmbusLib.c
index 93fadb6598..93fadb6598 100644
--- a/MdePkg/Library/DxeSmbusLib/SmbusLib.c
+++ b/OldMdePkg/Library/DxeSmbusLib/SmbusLib.c
diff --git a/MdePkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/OldMdePkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index 3439d6da35..3439d6da35 100644
--- a/MdePkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
+++ b/OldMdePkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
diff --git a/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa b/OldMdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
index 605579758c..605579758c 100644
--- a/MdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
+++ b/OldMdePkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.msa
diff --git a/MdePkg/Library/HiiLib/HiiLib.c b/OldMdePkg/Library/HiiLib/HiiLib.c
index d7fad9fd45..d7fad9fd45 100644
--- a/MdePkg/Library/HiiLib/HiiLib.c
+++ b/OldMdePkg/Library/HiiLib/HiiLib.c
diff --git a/MdePkg/Library/HiiLib/HiiLib.msa b/OldMdePkg/Library/HiiLib/HiiLib.msa
index d3eac8fb35..d3eac8fb35 100644
--- a/MdePkg/Library/HiiLib/HiiLib.msa
+++ b/OldMdePkg/Library/HiiLib/HiiLib.msa
diff --git a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c b/OldMdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
index d44725a728..d44725a728 100644
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
+++ b/OldMdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
diff --git a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa b/OldMdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
index cd1015bc3b..cd1015bc3b 100644
--- a/MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
+++ b/OldMdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.msa
diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/OldMdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index c14c100f42..c14c100f42 100644
--- a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/OldMdePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa b/OldMdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
index cd0052e0ef..cd0052e0ef 100644
--- a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
+++ b/OldMdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa b/OldMdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
index 2b1bf6ac2e..2b1bf6ac2e 100644
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
+++ b/OldMdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.msa
diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c b/OldMdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c
index 408ede45c7..408ede45c7 100644
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c
+++ b/OldMdePkg/Library/PeiDxePostCodeLibReportStatusCode/PostCode.c
diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/OldMdePkg/Library/PeiHobLib/HobLib.c
index fdefd0ea51..fdefd0ea51 100644
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/OldMdePkg/Library/PeiHobLib/HobLib.c
diff --git a/MdePkg/Library/PeiHobLib/PeiHobLib.msa b/OldMdePkg/Library/PeiHobLib/PeiHobLib.msa
index 3a5f65086e..3a5f65086e 100644
--- a/MdePkg/Library/PeiHobLib/PeiHobLib.msa
+++ b/OldMdePkg/Library/PeiHobLib/PeiHobLib.msa
diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c b/OldMdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
index ed09b4e5aa..ed09b4e5aa 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
+++ b/OldMdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c b/OldMdePkg/Library/PeiIoLibCpuIo/IoLib.c
index 1da0203b5c..1da0203b5c 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
+++ b/OldMdePkg/Library/PeiIoLibCpuIo/IoLib.c
diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c b/OldMdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c
index b8e6d83665..b8e6d83665 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c
+++ b/OldMdePkg/Library/PeiIoLibCpuIo/IoLibMmioBuffer.c
diff --git a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa b/OldMdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
index a458f327c2..a458f327c2 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
+++ b/OldMdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.msa
diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c b/OldMdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
index ece64d3dd7..ece64d3dd7 100644
--- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/OldMdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLibInternals.h b/OldMdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLibInternals.h
index 55e594fb38..55e594fb38 100644
--- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLibInternals.h
+++ b/OldMdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLibInternals.h
diff --git a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa b/OldMdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
index 602524b0d3..602524b0d3 100644
--- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
+++ b/OldMdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.msa
diff --git a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c b/OldMdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
index 4c0d3eaadb..4c0d3eaadb 100644
--- a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c b/OldMdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
index 9e620e2200..9e620e2200 100644
--- a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/MemLib.c b/OldMdePkg/Library/PeiMemoryLib/MemLib.c
index 6f81e21c24..6f81e21c24 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLib.c
+++ b/OldMdePkg/Library/PeiMemoryLib/MemLib.c
diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c b/OldMdePkg/Library/PeiMemoryLib/MemLibGeneric.c
index 759377483c..759377483c 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
+++ b/OldMdePkg/Library/PeiMemoryLib/MemLibGeneric.c
diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c b/OldMdePkg/Library/PeiMemoryLib/MemLibGuid.c
index 36da5b7424..36da5b7424 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
+++ b/OldMdePkg/Library/PeiMemoryLib/MemLibGuid.c
diff --git a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h b/OldMdePkg/Library/PeiMemoryLib/MemLibInternals.h
index 8646b24e79..8646b24e79 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
+++ b/OldMdePkg/Library/PeiMemoryLib/MemLibInternals.h
diff --git a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa b/OldMdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
index 5df4c2733f..5df4c2733f 100644
--- a/MdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
+++ b/OldMdePkg/Library/PeiMemoryLib/PeiMemoryLib.msa
diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
index 95f134bbda..95f134bbda 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
index 6a3dcd7ad2..6a3dcd7ad2 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
index b355fe647c..b355fe647c 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
index 2b21b22166..2b21b22166 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
index 889339c953..889339c953 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
index 15f8205ebc..15f8205ebc 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c b/OldMdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
index 981a7d4731..981a7d4731 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/OldMdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index e74ce8d65b..e74ce8d65b 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/SetMemWrapper.c
diff --git a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c b/OldMdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
index 90e607c0ce..90e607c0ce 100644
--- a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
+++ b/OldMdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/OldMdePkg/Library/PeiPcdLib/PeiPcdLib.c
index a7892f76f4..a7892f76f4 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/OldMdePkg/Library/PeiPcdLib/PeiPcdLib.c
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.msa b/OldMdePkg/Library/PeiPcdLib/PeiPcdLib.msa
index 363cdb422e..363cdb422e 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.msa
+++ b/OldMdePkg/Library/PeiPcdLib/PeiPcdLib.msa
diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/OldMdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
index c58ecb363c..c58ecb363c 100644
--- a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
+++ b/OldMdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
diff --git a/MdePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/OldMdePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index 05fdd9cdb8..05fdd9cdb8 100644
--- a/MdePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/OldMdePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c b/OldMdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
index 9cde383a9b..9cde383a9b 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
+++ b/OldMdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.c
diff --git a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa b/OldMdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
index 98c5064beb..98c5064beb 100644
--- a/MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
+++ b/OldMdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.msa
diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/OldMdePkg/Library/PeiServicesLib/PeiServicesLib.c
index e64618de21..e64618de21 100644
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
+++ b/OldMdePkg/Library/PeiServicesLib/PeiServicesLib.c
diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa b/OldMdePkg/Library/PeiServicesLib/PeiServicesLib.msa
index 6232b64188..6232b64188 100644
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.msa
+++ b/OldMdePkg/Library/PeiServicesLib/PeiServicesLib.msa
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/OldMdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index e1ff6edba9..e1ff6edba9 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/OldMdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa b/OldMdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
index 6e8480584d..6e8480584d 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
+++ b/OldMdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.msa
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
index 6f3155c8a7..6f3155c8a7 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
index 48d276c95a..48d276c95a 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
index aea35ef034..aea35ef034 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
index bb0463ef2a..bb0463ef2a 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
diff --git a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
index 4e4c064559..4e4c064559 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c b/OldMdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
index bcd35bcc28..bcd35bcc28 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa b/OldMdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
index 2e6d8fbe15..2e6d8fbe15 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointerLibMm7.msa
diff --git a/MdePkg/Library/PeiSmbusLib/InternalSmbusLib.h b/OldMdePkg/Library/PeiSmbusLib/InternalSmbusLib.h
index 58b093d039..58b093d039 100644
--- a/MdePkg/Library/PeiSmbusLib/InternalSmbusLib.h
+++ b/OldMdePkg/Library/PeiSmbusLib/InternalSmbusLib.h
diff --git a/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.c b/OldMdePkg/Library/PeiSmbusLib/PeiSmbusLib.c
index db28021d58..db28021d58 100644
--- a/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.c
+++ b/OldMdePkg/Library/PeiSmbusLib/PeiSmbusLib.c
diff --git a/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa b/OldMdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa
index a6e06b85d0..a6e06b85d0 100644
--- a/MdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa
+++ b/OldMdePkg/Library/PeiSmbusLib/PeiSmbusLib.msa
diff --git a/MdePkg/Library/PeiSmbusLib/SmbusLib.c b/OldMdePkg/Library/PeiSmbusLib/SmbusLib.c
index 93fadb6598..93fadb6598 100644
--- a/MdePkg/Library/PeiSmbusLib/SmbusLib.c
+++ b/OldMdePkg/Library/PeiSmbusLib/SmbusLib.c
diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c b/OldMdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
index b661646083..b661646083 100644
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
+++ b/OldMdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa b/OldMdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa
index d03d350671..d03d350671 100644
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa
+++ b/OldMdePkg/Library/PeimEntryPoint/PeimEntryPoint.msa
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c b/OldMdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
index 2e511704d8..2e511704d8 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
+++ b/OldMdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa b/OldMdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
index d6126f74e7..d6126f74e7 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
+++ b/OldMdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c b/OldMdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
index dd105de7fb..dd105de7fb 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
+++ b/OldMdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
diff --git a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c b/OldMdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
index d6d9beaaa1..d6d9beaaa1 100644
--- a/MdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
+++ b/OldMdePkg/Library/UefiApplicationEntryPoint/ApplicationEntryPoint.c
diff --git a/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa b/OldMdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa
index 8500f05d89..8500f05d89 100644
--- a/MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa
+++ b/OldMdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa
diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c b/OldMdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
index 26f62f6c95..26f62f6c95 100644
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
+++ b/OldMdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa b/OldMdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
index fb332b4370..fb332b4370 100644
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
+++ b/OldMdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.msa
diff --git a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c b/OldMdePkg/Library/UefiDebugLibConOut/DebugLib.c
index b3e83894c8..b3e83894c8 100644
--- a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
+++ b/OldMdePkg/Library/UefiDebugLibConOut/DebugLib.c
diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/OldMdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
index 9acf776d4d..9acf776d4d 100644
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
+++ b/OldMdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
diff --git a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c b/OldMdePkg/Library/UefiDebugLibStdErr/DebugLib.c
index d2fb46e23f..d2fb46e23f 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
+++ b/OldMdePkg/Library/UefiDebugLibStdErr/DebugLib.c
diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/OldMdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
index b9371c5632..b9371c5632 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
+++ b/OldMdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c b/OldMdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
index f3e04e0319..f3e04e0319 100644
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
+++ b/OldMdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa b/OldMdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
index b6b94f9df8..b6b94f9df8 100644
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
+++ b/OldMdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.msa
diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c b/OldMdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
index ec9b4aa321..ec9b4aa321 100644
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
+++ b/OldMdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa b/OldMdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
index 6a095e46fd..6a095e46fd 100644
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
+++ b/OldMdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.msa
diff --git a/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c b/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
index 9ec19e3f4a..9ec19e3f4a 100644
--- a/MdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
+++ b/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c
diff --git a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa b/OldMdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
index ce63976837..ce63976837 100644
--- a/MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
+++ b/OldMdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.msa
diff --git a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.c b/OldMdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.c
index 5795e5ae50..5795e5ae50 100644
--- a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.c
+++ b/OldMdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.c
diff --git a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa b/OldMdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
index e28bf79339..e28bf79339 100644
--- a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
+++ b/OldMdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
diff --git a/MdePkg/Library/UefiLib/Console.c b/OldMdePkg/Library/UefiLib/Console.c
index 4fbdef7350..4fbdef7350 100644
--- a/MdePkg/Library/UefiLib/Console.c
+++ b/OldMdePkg/Library/UefiLib/Console.c
diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/OldMdePkg/Library/UefiLib/UefiLib.c
index f03b881d35..f03b881d35 100644
--- a/MdePkg/Library/UefiLib/UefiLib.c
+++ b/OldMdePkg/Library/UefiLib/UefiLib.c
diff --git a/MdePkg/Library/UefiLib/UefiLib.msa b/OldMdePkg/Library/UefiLib/UefiLib.msa
index 19b5703a3f..19b5703a3f 100644
--- a/MdePkg/Library/UefiLib/UefiLib.msa
+++ b/OldMdePkg/Library/UefiLib/UefiLib.msa
diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/OldMdePkg/Library/UefiLib/UefiLibPrint.c
index a95178c879..a95178c879 100644
--- a/MdePkg/Library/UefiLib/UefiLibPrint.c
+++ b/OldMdePkg/Library/UefiLib/UefiLibPrint.c
diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/OldMdePkg/Library/UefiLib/UefiNotTiano.c
index 081e25439e..081e25439e 100644
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/OldMdePkg/Library/UefiLib/UefiNotTiano.c
diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c b/OldMdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
index 852a692344..852a692344 100644
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
+++ b/OldMdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa b/OldMdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
index 47aafb8bc2..47aafb8bc2 100644
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
+++ b/OldMdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa
diff --git a/MdePkg/MdePkg.fpd b/OldMdePkg/MdePkg.fpd
index a77ad4639e..2a7ba64f45 100644
--- a/MdePkg/MdePkg.fpd
+++ b/OldMdePkg/MdePkg.fpd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <PlatformHeader>

-    <PlatformName>MdePkgAll</PlatformName>

+    <PlatformName>OriginalMdePkgAll</PlatformName>

     <GuidValue>0fe7dd3e-0969-48c3-8cd2-de9a190088e2</GuidValue>

     <Version>0.3</Version>

     <Abstract>EFI/Tiano MdePkg Package</Abstract>

@@ -2348,4 +2348,4 @@
       </Sections>

     </Ffs>

   </BuildOptions>

-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>
diff --git a/MdePkg/MdePkg.spd b/OldMdePkg/MdePkg.spd
index 03b0d7d892..e01c5840f4 100644
--- a/MdePkg/MdePkg.spd
+++ b/OldMdePkg/MdePkg.spd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <SpdHeader>

-    <PackageName>MdePkg</PackageName>

+    <PackageName>Original MdePkg</PackageName>

     <GuidValue>5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec</GuidValue>

     <Version>0.3</Version>

     <Abstract>Framework Module Development Environment Industry Standards</Abstract>

@@ -2375,4 +2375,4 @@
       <HelpText>This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console.</HelpText>

     </PcdEntry>

   </PcdDeclarations>

-</PackageSurfaceArea>
\ No newline at end of file
+</PackageSurfaceArea>