EfiDriverLib,EfiLibInstallDriverBinding,R8_EfiLibInstallDriverBinding,%,MdePkg\r
EfiDriverLib,EfiLibInstallAllDriverProtocols,R8_EfiLibInstallAllDriverProtocols,%,MdePkg\r
EfiDriverLib,EfiLibCompareLanguage,R8_EfiLibCompareLanguage,%,MdePkg\r
-EfiDriverLib,EfiDevicePathSize,GetDevicePathSize,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiDuplicateDevicePath,DuplicateDevicePath,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiAppendDevicePath,AppendDevicePath,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiAppendDevicePathNode,AppendDevicePathNode,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiAppendDevicePathInstance,AppendDevicePathInstance,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiDevicePathInstance,GetNextDevicePathInstance,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiIsDevicePathMultiInstance,IsDevicePathMultiInstance,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiDevicePathFromHandle,DevicePathFromHandle,UefiDevicePathLib,MdePkg\r
-EfiDriverLib,EfiFileDevicePath,FileDevicePath,UefiDevicePathLib,MdePkg\r
+EfiDriverLib,EfiDevicePathSize,GetDevicePathSize,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiDuplicateDevicePath,DuplicateDevicePath,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiAppendDevicePath,AppendDevicePath,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiAppendDevicePathNode,AppendDevicePathNode,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiAppendDevicePathInstance,AppendDevicePathInstance,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiDevicePathInstance,GetNextDevicePathInstance,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiIsDevicePathMultiInstance,IsDevicePathMultiInstance,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiDevicePathFromHandle,DevicePathFromHandle,DevicePathLib,MdePkg\r
+EfiDriverLib,EfiFileDevicePath,FileDevicePath,DevicePathLib,MdePkg\r
EfiDriverLib,EfiLibGetSystemConfigurationTable,EfiGetSystemConfigurationTable,UefiLib,MdePkg\r
EfiDriverLib,EfiLibCreateProtocolNotifyEvent,EfiCreateProtocolNotifyEvent,UefiLib,MdePkg\r
EfiDriverLib,EfiLibNamedEventListen,EfiNamedEventListen,UefiLib,MdePkg\r
-EfiDriverLib,EfiLibNamedEventSignal,EfinNamedEventSignal,UefiLib,MdePkg\r
+EfiDriverLib,EfiLibNamedEventSignal,EfiNamedEventSignal,UefiLib,MdePkg\r
EfiDriverLib,EfiLibLookupUnicodeString,LookupUnicodeString,UefiLib,MdePkg\r
EfiDriverLib,EfiLibAddUnicodeString,AddUnicodeString,UefiLib,MdePkg\r
EfiDriverLib,EfiLibFreeUnicodeStringTable,FreeUnicodeStringTable,UefiLib,MdePkg\r
EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg\r
EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg\r
EfiDriverLib,EfiGetNameGuidFromFwVolDevicePathNode,EfiGetNameGuidFromFwVolDevicePathNode,UefiLib,MdePkg\r
-EfiDriverLib,EfiLibReportStatusCode,ReportStatusCode,ReportStatusCodeLib,MdePkg\r
+EfiDriverLib,EfiLibReportStatusCode,gRT->ReportStatusCode,ReportStatusCodeLib,MdePkg\r
EfiDriverLib,ReportStatusCodeWithDevicePath,ReportStatusCodeWithDevicePath,ReportStatusCodeLib,MdePkg\r
EfiDriverLib,EFI_FIELD_OFFSET,EFI_FIELD_OFFSET,BaseLib,MdePkg\r
EfiDriverLib,EFI_LIST,LIST_ENTRY,BaseLib,MdePkg\r
-EfiDriverLib,EFI_LIST_ENTRY,LIST_ENTRY,BaseLib,MdePkg\r
-EfiDriverLib,EFI_LIST_NODE,LIST_ENTRY,BaseLib,MdePkg\r
+EfiDriverLib,EFI_LIST_ENTRY,LIST_ENTRY ,BaseLib,MdePkg\r
+EfiDriverLib,EFI_LIST_NODE,LIST_ENTRY ,BaseLib,MdePkg\r
EfiDriverLib,FLOCK,EFI_LOCK,UefiLib,MdePkg\r
EfiDriverLib,GetFirstNode,GetFirstNode,BaseLib,MdePkg\r
EfiDriverLib,GetNextNode,GetNextNode,BaseLib,MdePkg\r
EfiCommonLib,CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS,PrintLib,MdePkg\r
EfiCommonLib,CodeTypeToPostCode,CodeTypeToPostCode,ReportStatusCodeLib,MdePkg\r
EfiCommonLib,COMMA_TYPE,COMMA_TYPE,PrintLib,MdePkg\r
-EfiCommonLib,DivU64x32,DivU64x64Remainder ,BaseLib,MdePkg\r
+EfiCommonLib,DivU64x32,DivU64x64Remainder,BaseLib,MdePkg\r
EfiCommonLib,EfiAsciiStrCpy,AsciiStrCpy,BaseLib,MdePkg\r
EfiCommonLib,EfiAsciiStrLen,AsciiStrLen,BaseLib,MdePkg\r
EfiCommonLib,EfiCommonIoRead,n/a,n/a,MdePkg\r
PeiLib,MultU64x32,MultU64x32,BaseLib,MdePkg\r
PeiLib,PeiBuildHobModule,BuildModuleHob#%,HobLib,MdePkg\r
PeiLib,PeiBuildHobResourceDescriptor,BuildResourceDescriptorHob#%,HobLib,MdePkg\r
-PeiLib,PeiBuildHobGuid,BuildGuidHob#%,HobLib,MdePkg\r
+PeiLib,PeiBuildHobGuid,R8_PeiBuildHobGuid#%,%,MdePkg\r
PeiLib,PeiBuildHobGuidData,BuildGuidDataHob#%,HobLib,MdePkg\r
PeiLib,PeiBuildHobFv,BuildFvHob#%,HobLib,MdePkg\r
PeiLib,PeiBuildHobCpu,BuildCpuHob#%,HobLib,MdePkg\r