mirror of https://github.com/acidanthera/audk.git
Fixed compilation of all packages tracked by CI after rebasing upon edk2-stable202311.
This commit is contained in:
parent
04e068e0b8
commit
cf38766c99
|
@ -1349,7 +1349,6 @@ DEFINE CLANGDWARF_RISCV64_DLINK_FLAGS = DEF(CLANGDWARF_RISCV64_TARGET) DEF
|
|||
*_CLANGDWARF_RISCV64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0x240
|
||||
*_CLANGDWARF_RISCV64_PLATFORM_FLAGS =
|
||||
*_CLANGDWARF_RISCV64_PP_FLAGS = DEF(GCC_PP_FLAGS) DEF(CLANGDWARF_RISCV64_TARGET) $(PLATFORM_FLAGS)
|
||||
*_CLANGDWARF_RISCV64_RC_FLAGS = DEF(GCC_RISCV64_RC_FLAGS)
|
||||
*_CLANGDWARF_RISCV64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) DEF(CLANGDWARF_RISCV64_TARGET) $(PLATFORM_FLAGS)
|
||||
*_CLANGDWARF_RISCV64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) DEF(CLANGDWARF_RISCV64_TARGET)
|
||||
*_CLANGDWARF_RISCV64_CC_SECPEIFLAGS = DEF(GCC_RISCV64_CC_SECPEIFLAGS)
|
||||
|
|
|
@ -15,7 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
|||
//
|
||||
// Decompression algorithm begins here
|
||||
//
|
||||
#define UINT8_MAX 0xff
|
||||
#define BITBUFSIZ 32
|
||||
#define MAXMATCH 256
|
||||
#define THRESHOLD 3
|
||||
|
@ -899,5 +898,3 @@ Extract (
|
|||
|
||||
return Status;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,76 @@
|
|||
/** @file
|
||||
Include file for the WinNt Library
|
||||
|
||||
Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||
SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
**/
|
||||
|
||||
#ifndef __WIN_NT_INCLUDE_H__
|
||||
#define __WIN_NT_INCLUDE_H__
|
||||
|
||||
#define GUID _WINNT_DUP_GUID_____
|
||||
#define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD
|
||||
#define LIST_ENTRY _WINNT_DUP_LIST_ENTRY
|
||||
|
||||
#if (_MSC_VER < 1800)
|
||||
#define InterlockedIncrement _WINNT_DUP_InterlockedIncrement
|
||||
#define InterlockedDecrement _WINNT_DUP_InterlockedDecrement
|
||||
#define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64
|
||||
#endif
|
||||
|
||||
#undef UNALIGNED
|
||||
#undef CONST
|
||||
#undef VOID
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "windows.h"
|
||||
|
||||
//
|
||||
// Win32 include files do not compile clean with /W4, so we use the warning
|
||||
// pragma to suppress the warnings for Win32 only. This way our code can still
|
||||
// compile at /W4 (highest warning level) with /WX (warnings cause build
|
||||
// errors).
|
||||
//
|
||||
#pragma warning(disable : 4115)
|
||||
#pragma warning(disable : 4201)
|
||||
#pragma warning(disable : 4214)
|
||||
#pragma warning(disable : 4028)
|
||||
#pragma warning(disable : 4133)
|
||||
|
||||
//
|
||||
// Set the warnings back on as the EFI code must be /W4.
|
||||
//
|
||||
#pragma warning(default : 4115)
|
||||
#pragma warning(default : 4201)
|
||||
|
||||
#endif
|
||||
|
||||
#undef GUID
|
||||
#undef _LIST_ENTRY
|
||||
#undef LIST_ENTRY
|
||||
#undef InterlockedIncrement
|
||||
#undef InterlockedDecrement
|
||||
#undef InterlockedCompareExchange64
|
||||
#undef InterlockedCompareExchangePointer
|
||||
|
||||
#define VOID void
|
||||
|
||||
//
|
||||
// Prevent collisions with Windows API name macros that deal with Unicode/Not issues
|
||||
//
|
||||
#undef LoadImage
|
||||
#undef CreateEvent
|
||||
|
||||
//
|
||||
// FAR is used as a struct member name by DebugSupport.h.
|
||||
//
|
||||
#undef FAR
|
||||
|
||||
//
|
||||
// These two macros collide with re-definitions and case labels.
|
||||
//
|
||||
#undef ERROR
|
||||
#undef MAX_PATH
|
||||
|
||||
#endif
|
|
@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
|||
#include "WinNtInclude.h"
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include <windows.h>
|
||||
#include <io.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -3595,7 +3595,7 @@ Returns:
|
|||
Machine = UefiImageGetMachine (&ImageContext);
|
||||
|
||||
if ( (Machine == IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) ||
|
||||
(Machine == IMAGE_FILE_MACHINE_AARCH64) ) {
|
||||
(Machine == IMAGE_FILE_MACHINE_ARM64) ) {
|
||||
mArm = TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@ Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
|
|||
SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
**/
|
||||
|
||||
#include "WinNtInclude.h"
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include <windows.h>
|
||||
#include <io.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -11,10 +11,6 @@
|
|||
#ifndef __BT_BASE_TYPES_H__
|
||||
#define __BT_BASE_TYPES_H__
|
||||
|
||||
//
|
||||
// To be able to safely include Windows headers, we need to include
|
||||
// WinNtInclude.h first.
|
||||
//
|
||||
#include "WinNtInclude.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
|
|
|
@ -44,4 +44,12 @@ memcpy (
|
|||
return CopyMem (dest, src, (UINTN)count);
|
||||
}
|
||||
|
||||
void
|
||||
__bzero (
|
||||
void *src,
|
||||
unsigned int count
|
||||
)
|
||||
{
|
||||
ZeroMem (src, count);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -23,10 +23,9 @@
|
|||
|
||||
[Sources]
|
||||
MemoryIntrinsics.c
|
||||
|
||||
[Sources.IA32]
|
||||
CopyMem.c
|
||||
|
||||
[Sources.IA32]
|
||||
Ia32/MathDivU64xU64Rem.c | MSFT
|
||||
Ia32/MathLShiftS64.c | MSFT
|
||||
Ia32/MathRShiftU64.c | MSFT
|
||||
|
@ -36,7 +35,6 @@
|
|||
Ia32/MathUlldiv.asm | MSFT
|
||||
Ia32/MathUlldvrm.asm | MSFT
|
||||
Ia32/MathLldiv.asm | MSFT
|
||||
Ia32/MathUllrem.asm | MSFT
|
||||
|
||||
Ia32/MathDivU64xU64Rem.c | INTEL
|
||||
Ia32/MathLShiftS64.c | INTEL
|
||||
|
@ -49,10 +47,6 @@
|
|||
Ia32/MathDivS64x64.c | GCC
|
||||
Ia32/MathDivU64x64.c | GCC
|
||||
Ia32/MathModU64x64.c | GCC
|
||||
[Sources.X64]
|
||||
CopyMem.c
|
||||
[Sources.RISCV64]
|
||||
CopyMem.c
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
|
|
|
@ -38,7 +38,6 @@
|
|||
FspWrapperPlatformLib
|
||||
FspWrapperHobProcessLib
|
||||
CpuLib
|
||||
UefiCpuLib
|
||||
UefiImageExtraActionLib
|
||||
PerformanceLib
|
||||
TimerLib
|
||||
|
|
|
@ -39,7 +39,6 @@
|
|||
FspWrapperPlatformLib
|
||||
FspWrapperHobProcessLib
|
||||
CpuLib
|
||||
UefiCpuLib
|
||||
UefiImageExtraActionLib
|
||||
PerformanceLib
|
||||
FspWrapperApiLib
|
||||
|
|
|
@ -760,7 +760,7 @@ UndiReceiveFilter (
|
|||
Cdb->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;
|
||||
}
|
||||
|
||||
if ((Cdb->CPBsize == 0)) {
|
||||
if (Cdb->CPBsize == 0) {
|
||||
Cdb->StatFlags = PXE_STATFLAGS_COMMAND_FAILED;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -918,7 +918,7 @@ GetLockOnVariableStateVariablePolicyInfo (
|
|||
LocalLockOnVarStatePolicy = (VARIABLE_LOCK_ON_VAR_STATE_POLICY *)(MatchPolicy + 1);
|
||||
CopyMem (VariablePolicy, LocalLockOnVarStatePolicy, sizeof (*LocalLockOnVarStatePolicy));
|
||||
|
||||
if ((VariableLockPolicyVariableNameBufferSize == NULL)) {
|
||||
if (VariableLockPolicyVariableNameBufferSize == NULL) {
|
||||
if (VariableLockPolicyVariableName != NULL) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
|
|
@ -107,6 +107,7 @@
|
|||
VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
|
||||
IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf
|
||||
SpiHcPlatformLib|MdeModulePkg/Library/BaseSpiHcPlatformLibNull/BaseSpiHcPlatformLibNull.inf
|
||||
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
|
||||
|
||||
[LibraryClasses.EBC.PEIM]
|
||||
IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
|
||||
|
@ -132,10 +133,10 @@
|
|||
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
|
||||
MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
|
||||
LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
|
||||
UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
|
||||
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
|
||||
MicrocodeLib|UefiCpuPkg/Library/MicrocodeLib/MicrocodeLib.inf
|
||||
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf
|
||||
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
|
||||
|
||||
[LibraryClasses.IA32.DXE_CORE]
|
||||
CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf
|
||||
|
|
|
@ -127,7 +127,7 @@
|
|||
|
||||
# Onigurama: corrects build for llvm-15
|
||||
CLANGPDB:*_*_*_CC_FLAGS = -Wno-deprecated-non-prototype
|
||||
CLANGGCC:*_*_*_CC_FLAGS = -Wno-deprecated-non-prototype
|
||||
GCC:*_CLANGDWARF_*_CC_FLAGS = -Wno-deprecated-non-prototype
|
||||
|
||||
# Not add -Wno-error=maybe-uninitialized option for XCODE
|
||||
# XCODE doesn't know this option
|
||||
|
|
|
@ -40,6 +40,8 @@
|
|||
#define IMAGE_FILE_MACHINE_RISCV32 0x5032
|
||||
#define IMAGE_FILE_MACHINE_RISCV64 0x5064
|
||||
#define IMAGE_FILE_MACHINE_RISCV128 0x5128
|
||||
#define IMAGE_FILE_MACHINE_LOONGARCH32 0x6232
|
||||
#define IMAGE_FILE_MACHINE_LOONGARCH64 0x6264
|
||||
|
||||
//
|
||||
// EXE file formats
|
||||
|
|
|
@ -57,6 +57,6 @@
|
|||
BaseMemoryLib
|
||||
|
||||
[BuildOptions]
|
||||
MSFT:*_*_IA32_CC_FLAGS = /wd4146 /wd4245
|
||||
MSFT:*_*_X64_CC_FLAGS = /wd4146 /wd4244 /wd4245 /wd4267
|
||||
|
||||
MSFT:*_*_IA32_CC_FLAGS = /wd4146 /wd4245 /wd4706
|
||||
MSFT:*_*_X64_CC_FLAGS = /wd4146 /wd4244 /wd4245 /wd4267 /wd4706
|
||||
XCODE:*_*_X64_CC_FLAGS = -U__APPLE__
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
|
||||
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
|
||||
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
|
||||
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
|
||||
UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
|
||||
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
|
||||
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <IndustryStandard/IntelTdx.h>
|
||||
#include <Library/PeiServicesLib.h>
|
||||
#include <Pi/PiHob.h>
|
||||
#include <Library/TdxLib.h>
|
||||
#include <WorkArea.h>
|
||||
#include <ConfidentialComputingGuestAttr.h>
|
||||
|
||||
|
|
|
@ -329,6 +329,7 @@
|
|||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
|
||||
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
|
||||
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
|
||||
|
||||
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
|
||||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||
|
|
|
@ -348,6 +348,7 @@
|
|||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
|
||||
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
|
||||
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
|
||||
|
||||
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
|
||||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||
|
|
|
@ -38,3 +38,6 @@
|
|||
[Protocols]
|
||||
gVirtioDeviceProtocolGuid ## TO_START
|
||||
gEfiSerialIoProtocolGuid
|
||||
|
||||
[BuildOptions]
|
||||
MSFT:*_*_*_CC_FLAGS = /wd4204
|
||||
|
|
|
@ -859,32 +859,15 @@ InitializeHiiPackage (
|
|||
IN EFI_HANDLE ImageHandle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_HII_PACKAGE_LIST_HEADER *PackageList;
|
||||
EFI_HII_HANDLE HiiHandle;
|
||||
|
||||
//
|
||||
// Retrieve HII package list from ImageHandle
|
||||
//
|
||||
Status = gBS->OpenProtocol (
|
||||
ImageHandle,
|
||||
&gEfiHiiPackageListProtocolGuid,
|
||||
(VOID **)&PackageList,
|
||||
ImageHandle,
|
||||
NULL,
|
||||
EFI_OPEN_PROTOCOL_GET_PROTOCOL
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return NULL;
|
||||
}
|
||||
EFI_STATUS Status;
|
||||
EFI_HII_HANDLE HiiHandle;
|
||||
|
||||
//
|
||||
// Publish HII package list to HII Database.
|
||||
//
|
||||
Status = gHiiDatabase->NewPackageList (
|
||||
gHiiDatabase,
|
||||
PackageList,
|
||||
&gModuleHiiPackageList->Header,
|
||||
NULL,
|
||||
&HiiHandle
|
||||
);
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
|
||||
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
|
||||
LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
|
||||
UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
|
||||
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
|
||||
UefiImageExtraActionLib|SourceLevelDebugPkg/Library/UefiImageExtraActionLibDebug/UefiImageExtraActionLibDebug.inf
|
||||
TimerLib|UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
PcdLib
|
||||
DebugAgentLib
|
||||
CpuLib
|
||||
UefiCpuLib
|
||||
UefiImageExtraActionLib
|
||||
CpuExceptionHandlerLib
|
||||
ReportStatusCodeLib
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <Library/BaseMemoryLib.h>
|
||||
#include <Library/PlatformSecLib.h>
|
||||
#include <Library/CpuLib.h>
|
||||
#include <Library/UefiCpuLib.h>
|
||||
|
||||
#include <Library/UefiImageExtraActionLib.h>
|
||||
#include <Library/DebugAgentLib.h>
|
||||
|
|
|
@ -360,6 +360,7 @@
|
|||
!endif
|
||||
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
|
||||
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
|
||||
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
|
||||
|
||||
[LibraryClasses.common.DXE_DRIVER]
|
||||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||
|
|
Loading…
Reference in New Issue