mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-31 01:24:12 +02:00
Sync BaseTool trunk (version r2649) into EDKII BaseTools.
Signed-off-by: Gao, Liming <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15188 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
7771be9fd0
commit
f51461c829
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -192,11 +192,6 @@ DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Develope
|
||||
|
||||
DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin
|
||||
|
||||
#
|
||||
# Change to the location clang was built
|
||||
#
|
||||
DEFINE CLANG_BIN = /usr/bin/
|
||||
|
||||
####################################################################################
|
||||
#
|
||||
# format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>
|
||||
@ -3136,11 +3131,11 @@ DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-strict-aliasing -
|
||||
DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe
|
||||
DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe
|
||||
DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency
|
||||
DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address
|
||||
DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft
|
||||
DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address
|
||||
DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie
|
||||
DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections
|
||||
DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Ttext=0x0 --emit-relocs -nostdlib --gc-sections -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
DEFINE GCC_IA32_X64_ASLDLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
|
||||
DEFINE GCC_ARM_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) --entry ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
|
||||
DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
@ -3184,7 +3179,7 @@ DEFINE GCC46_IA32_X64_DLINK_FLAGS = DEF(GCC45_IA32_X64_DLINK_FLAGS)
|
||||
DEFINE GCC46_X64_DLINK_FLAGS = DEF(GCC45_X64_DLINK_FLAGS)
|
||||
DEFINE GCC46_ASM_FLAGS = DEF(GCC45_ASM_FLAGS)
|
||||
DEFINE GCC46_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
|
||||
DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -mno-unaligned-access -Wno-address -fomit-frame-pointer
|
||||
DEFINE GCC46_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) DEF(GCC_ARM_CC_FLAGS) -mno-unaligned-access
|
||||
DEFINE GCC46_ARM_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm
|
||||
DEFINE GCC46_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) --oformat=elf32-littlearm
|
||||
|
||||
@ -3198,7 +3193,7 @@ DEFINE GCC47_ASM_FLAGS = DEF(GCC46_ASM_FLAGS)
|
||||
DEFINE GCC47_ARM_ASM_FLAGS = DEF(GCC46_ARM_ASM_FLAGS)
|
||||
DEFINE GCC47_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
|
||||
DEFINE GCC47_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS)
|
||||
DEFINE GCC47_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address
|
||||
DEFINE GCC47_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC44_ALL_CC_FLAGS) DEF(GCC_AARCH64_CC_FLAGS)
|
||||
DEFINE GCC47_ARM_DLINK_FLAGS = DEF(GCC46_ARM_DLINK_FLAGS)
|
||||
DEFINE GCC47_AARCH64_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON)
|
||||
DEFINE GCC47_ARM_ASLDLINK_FLAGS = DEF(GCC46_ARM_ASLDLINK_FLAGS)
|
||||
@ -3516,7 +3511,7 @@ DEFINE GCC48_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
|
||||
*_GCC46_ARM_ASLPP_PATH = ENV(GCC46_ARM_PREFIX)gcc
|
||||
*_GCC46_ARM_RC_PATH = ENV(GCC46_ARM_PREFIX)objcopy
|
||||
|
||||
*_GCC46_ARM_ARCHCC_FLAGS = -mthumb
|
||||
*_GCC46_ARM_ARCHCC_FLAGS =
|
||||
*_GCC46_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
|
||||
*_GCC46_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
|
||||
@ -3610,7 +3605,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
||||
*_GCC47_ARM_ASLPP_PATH = ENV(GCC47_ARM_PREFIX)gcc
|
||||
*_GCC47_ARM_RC_PATH = ENV(GCC47_ARM_PREFIX)objcopy
|
||||
|
||||
*_GCC47_ARM_ARCHCC_FLAGS = -mthumb
|
||||
*_GCC47_ARM_ARCHCC_FLAGS =
|
||||
*_GCC47_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
|
||||
*_GCC47_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
|
||||
@ -5484,15 +5479,15 @@ RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter
|
||||
RELEASE_XCLANG_*_MTOC_FLAGS = -align 0x20
|
||||
|
||||
|
||||
*_XCLANG_*_CC_PATH = DEF(CLANG_BIN)clang
|
||||
*_XCLANG_*_CC_PATH = ENV(CLANG_BIN)clang
|
||||
*_XCLANG_*_SLINK_PATH = libtool
|
||||
*_XCLANG_*_DLINK_PATH = ld
|
||||
*_XCLANG_*_ASM_PATH = as
|
||||
*_XCLANG_*_PP_PATH = DEF(CLANG_BIN)clang
|
||||
*_XCLANG_*_VFRPP_PATH = DEF(CLANG_BIN)clang
|
||||
*_XCLANG_*_PP_PATH = ENV(CLANG_BIN)clang
|
||||
*_XCLANG_*_VFRPP_PATH = ENV(CLANG_BIN)clang
|
||||
*_XCLANG_*_ASL_PATH = iasl
|
||||
*_XCLANG_*_ASLCC_PATH = DEF(CLANG_BIN)clang
|
||||
*_XCLANG_*_ASLPP_PATH = DEF(CLANG_BIN)clang
|
||||
*_XCLANG_*_ASLCC_PATH = ENV(CLANG_BIN)clang
|
||||
*_XCLANG_*_ASLPP_PATH = ENV(CLANG_BIN)clang
|
||||
*_XCLANG_*_ASLDLINK_PATH = ld
|
||||
|
||||
####################
|
||||
@ -5550,7 +5545,7 @@ DEFINE RVCT_ALL_DLINK_FLAGS = --ro-base 0 --no_scanlib --reloc --no_exceptions
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
*_RVCT_ARM_ARCHCC_FLAGS = --thumb
|
||||
*_RVCT_ARM_ARCHCC_FLAGS = --thumb --fpu=softvfp
|
||||
*_RVCT_ARM_ARCHASM_FLAGS =
|
||||
*_RVCT_ARM_ARCHDLINK_FLAGS =
|
||||
*_RVCT_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
@ -5592,7 +5587,7 @@ RELEASE_RVCT_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppress=5
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb
|
||||
*_RVCTLINUX_ARM_ARCHCC_FLAGS = --thumb --fpu=softvfp
|
||||
*_RVCTLINUX_ARM_ARCHASM_FLAGS =
|
||||
*_RVCTLINUX_ARM_ARCHDLINK_FLAGS =
|
||||
*_RVCTLINUX_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
@ -5639,7 +5634,7 @@ RELEASE_RVCTLINUX_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --diag_suppr
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb
|
||||
*_RVCTCYGWIN_ARM_ARCHCC_FLAGS = --thumb --fpu=softvfp
|
||||
*_RVCTCYGWIN_ARM_ARCHASM_FLAGS =
|
||||
*_RVCTCYGWIN_ARM_ARCHDLINK_FLAGS =
|
||||
*_RVCTCYGWIN_ARM_PLATFORM_FLAGS = --cpu 7-A
|
||||
@ -5707,7 +5702,7 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
*_ARMGCC_ARM_ARCHCC_FLAGS = -mthumb
|
||||
*_ARMGCC_ARM_ARCHCC_FLAGS =
|
||||
*_ARMGCC_ARM_ARCHASM_FLAGS =
|
||||
*_ARMGCC_ARM_ARCHDLINK_FLAGS =
|
||||
*_ARMGCC_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
@ -5719,7 +5714,7 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittle-end
|
||||
*_ARMGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
|
||||
*_ARMGCC_ARM_SLINK_FLAGS = -rc
|
||||
*_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
*_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm
|
||||
|
||||
DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -O0
|
||||
RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -Wno-unused
|
||||
@ -5755,7 +5750,7 @@ RELEASE_ARMGCC_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS)
|
||||
*_ARMGCC_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
|
||||
*_ARMGCC_AARCH64_SLINK_FLAGS = -rc
|
||||
*_ARMGCC_AARCH64_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
*_ARMGCC_AARCH64_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON)
|
||||
|
||||
DEBUG_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -O0
|
||||
RELEASE_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
|
||||
@ -5801,7 +5796,7 @@ RELEASE_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARC
|
||||
#
|
||||
# Use default values, or override in DSC file
|
||||
#
|
||||
*_ARMLINUXGCC_ARM_ARCHCC_FLAGS = -mthumb
|
||||
*_ARMLINUXGCC_ARM_ARCHCC_FLAGS =
|
||||
*_ARMLINUXGCC_ARM_ARCHASM_FLAGS =
|
||||
*_ARMLINUXGCC_ARM_ARCHDLINK_FLAGS =
|
||||
*_ARMLINUXGCC_ARM_PLATFORM_FLAGS = -march=armv7-a
|
||||
@ -5813,7 +5808,7 @@ RELEASE_ARMLINUXGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -mlittl
|
||||
*_ARMLINUXGCC_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
|
||||
*_ARMLINUXGCC_ARM_SLINK_FLAGS = -rc
|
||||
*_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
*_ARMLINUXGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON) --oformat=elf32-littlearm
|
||||
|
||||
DEBUG_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -O0
|
||||
RELEASE_ARMLINUXGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARM_CC_FLAGS) -fno-stack-protector -mno-unaligned-access -Wno-unused-but-set-variable
|
||||
@ -5849,7 +5844,7 @@ RELEASE_ARMLINUXGCC_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS)
|
||||
*_ARMLINUXGCC_AARCH64_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
|
||||
|
||||
*_ARMLINUXGCC_AARCH64_SLINK_FLAGS = -rc
|
||||
*_ARMLINUXGCC_AARCH64_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map
|
||||
*_ARMLINUXGCC_AARCH64_DLINK_FLAGS = $(ARCHDLINK_FLAGS) DEF(GCC_ARM_AARCH64_DLINK_COMMON)
|
||||
|
||||
DEBUG_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -O0
|
||||
RELEASE_ARMLINUXGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARCH64_CC_FLAGS) -Wno-address -Wno-unused-but-set-variable
|
||||
|
@ -14,4 +14,4 @@
|
||||
|
||||
**/
|
||||
|
||||
#define __BUILD_VERSION "Build 2640"
|
||||
#define __BUILD_VERSION "Build 2649"
|
||||
|
@ -82,7 +82,7 @@ SPendingAssign::AssignValue (
|
||||
IN UINT32 Len
|
||||
)
|
||||
{
|
||||
memcpy (mAddr, Addr, (mLen < Len ? mLen : Len));
|
||||
memmove (mAddr, Addr, (mLen < Len ? mLen : Len));
|
||||
mFlag = ASSIGNED;
|
||||
}
|
||||
|
||||
@ -685,7 +685,7 @@ CFormPkg::AdjustDynamicInsertOpcode (
|
||||
//
|
||||
// Override the restore buffer data.
|
||||
//
|
||||
memcpy (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
|
||||
memmove (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
|
||||
InsertOpcodeNode->mBufferFree -= NeedRestoreCodeLen;
|
||||
memset (InsertOpcodeNode->mBufferFree, 0, NeedRestoreCodeLen);
|
||||
} else {
|
||||
@ -733,7 +733,7 @@ CFormPkg::AdjustDynamicInsertOpcode (
|
||||
//
|
||||
// Override the restore buffer data.
|
||||
//
|
||||
memcpy (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
|
||||
memmove (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
|
||||
InsertOpcodeNode->mBufferFree -= InsertOpcodeAddr - InsertOpcodeNode->mBufferStart;
|
||||
|
||||
//
|
||||
@ -1542,7 +1542,7 @@ CIfrObj::_EMIT_PENDING_OBJ (
|
||||
//
|
||||
ObjBinBuf = gCFormPkg.IfrBinBufferGet (mObjBinLen);
|
||||
if (ObjBinBuf != NULL) {
|
||||
memcpy (ObjBinBuf, mObjBinBuf, mObjBinLen);
|
||||
memmove (ObjBinBuf, mObjBinBuf, mObjBinLen);
|
||||
}
|
||||
|
||||
//
|
||||
|
@ -368,7 +368,7 @@ public:
|
||||
VOID VARSTORE_INFO (OUT EFI_VARSTORE_INFO *Info) {
|
||||
if (Info != NULL) {
|
||||
Info->mVarStoreId = mHeader->VarStoreId;
|
||||
memcpy (&Info->mVarStoreId, &mHeader->VarStoreInfo, sizeof (Info->mVarStoreId));
|
||||
memmove (&Info->mVarStoreId, &mHeader->VarStoreInfo, sizeof (Info->mVarStoreId));
|
||||
}
|
||||
}
|
||||
|
||||
@ -615,7 +615,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetGuid (IN EFI_GUID *Guid) {
|
||||
memcpy (&mFormSet->Guid, Guid, sizeof (EFI_GUID));
|
||||
memmove (&mFormSet->Guid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
VOID SetFormSetTitle (IN EFI_STRING_ID FormSetTitle) {
|
||||
@ -627,7 +627,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetClassGuid (IN EFI_GUID *Guid) {
|
||||
memcpy (&(mClassGuid[mFormSet->Flags++]), Guid, sizeof (EFI_GUID));
|
||||
memmove (&(mClassGuid[mFormSet->Flags++]), Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
UINT8 GetFlags() {
|
||||
@ -749,7 +749,7 @@ public:
|
||||
IncLength (sizeof (EFI_IFR_FORM_MAP_METHOD));
|
||||
|
||||
mMethodMap->MethodTitle = MethodTitle;
|
||||
memcpy (&(mMethodMap->MethodIdentifier), MethodGuid, sizeof (EFI_GUID));
|
||||
memmove (&(mMethodMap->MethodIdentifier), MethodGuid, sizeof (EFI_GUID));
|
||||
mMethodMap ++;
|
||||
}
|
||||
}
|
||||
@ -769,7 +769,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetGuid (IN EFI_GUID *Guid) {
|
||||
memcpy (&mVarStore->Guid, Guid, sizeof (EFI_GUID));
|
||||
memmove (&mVarStore->Guid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
VOID SetVarStoreId (IN EFI_VARSTORE_ID VarStoreId) {
|
||||
@ -809,7 +809,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetGuid (IN EFI_GUID *Guid) {
|
||||
memcpy (&mVarStoreEfi->Guid, Guid, sizeof (EFI_GUID));
|
||||
memmove (&mVarStoreEfi->Guid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
VOID SetVarStoreId (IN UINT16 VarStoreId) {
|
||||
@ -863,7 +863,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetGuid (IN EFI_GUID *Guid) {
|
||||
memcpy (&mVarStoreNameValue->Guid, Guid, sizeof (EFI_GUID));
|
||||
memmove (&mVarStoreNameValue->Guid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
VOID SetVarStoreId (IN UINT16 VarStoreId) {
|
||||
@ -938,7 +938,7 @@ public:
|
||||
CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, Size) {
|
||||
mDefault->Type = Type;
|
||||
mDefault->DefaultId = DefaultId;
|
||||
memcpy (&(mDefault->Value), &Value, Size - OFFSET_OF (EFI_IFR_DEFAULT, Value));
|
||||
memmove (&(mDefault->Value), &Value, Size - OFFSET_OF (EFI_IFR_DEFAULT, Value));
|
||||
}
|
||||
|
||||
VOID SetDefaultId (IN UINT16 DefaultId) {
|
||||
@ -950,7 +950,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {
|
||||
memcpy (&mDefault->Value, &Value, mDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));
|
||||
memmove (&mDefault->Value, &Value, mDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));
|
||||
}
|
||||
};
|
||||
|
||||
@ -1673,7 +1673,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetRefreshEventGroutId (IN EFI_GUID *RefreshEventGroupId) {
|
||||
memcpy (&mRefreshId->RefreshEventGroupId, RefreshEventGroupId, sizeof (EFI_GUID));
|
||||
memmove (&mRefreshId->RefreshEventGroupId, RefreshEventGroupId, sizeof (EFI_GUID));
|
||||
}
|
||||
};
|
||||
|
||||
@ -1755,7 +1755,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {
|
||||
memcpy (&mOneOfOption->Value, &Value, mOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
|
||||
memmove (&mOneOfOption->Value, &Value, mOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
|
||||
}
|
||||
|
||||
UINT8 GetFlags (VOID) {
|
||||
@ -1904,11 +1904,11 @@ public:
|
||||
}
|
||||
|
||||
VOID SetGuid (IN EFI_GUID *Guid) {
|
||||
memcpy (&mGuid->Guid, Guid, sizeof (EFI_GUID));
|
||||
memmove (&mGuid->Guid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
VOID SetData (IN UINT8* DataBuff, IN UINT8 Size) {
|
||||
memcpy ((UINT8 *)mGuid + sizeof (EFI_IFR_GUID), DataBuff, Size);
|
||||
memmove ((UINT8 *)mGuid + sizeof (EFI_IFR_GUID), DataBuff, Size);
|
||||
}
|
||||
};
|
||||
|
||||
@ -2214,7 +2214,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetPermissions (IN EFI_GUID *Permissions) {
|
||||
memcpy (&mSecurity->Permissions, Permissions, sizeof (EFI_GUID));
|
||||
memmove (&mSecurity->Permissions, Permissions, sizeof (EFI_GUID));
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -13,4 +13,4 @@
|
||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#
|
||||
|
||||
gBUILD_VERSION = "Build 2640"
|
||||
gBUILD_VERSION = "Build 2649"
|
||||
|
@ -17,4 +17,4 @@
|
||||
Build version information
|
||||
'''
|
||||
|
||||
gBUILD_VERSION = "Build 2640"
|
||||
gBUILD_VERSION = "Build 2649"
|
||||
|
@ -1811,7 +1811,7 @@ class InfBuildData(ModuleBuildClassObject):
|
||||
else:
|
||||
Tool = ToolList[0]
|
||||
ToolChain = "*_*_*_%s_FLAGS" % Tool
|
||||
ToolChainFamily = ''
|
||||
ToolChainFamily = 'MSFT' # Edk.x only support MSFT tool chain
|
||||
#ignore not replaced macros in value
|
||||
ValueList = GetSplitList(' ' + Value, '/D')
|
||||
Dummy = ValueList[0]
|
||||
|
Loading…
x
Reference in New Issue
Block a user