From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.9085.1595557747121118808 for ; Thu, 23 Jul 2020 19:29:07 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: samer.el-haj-mahmoud@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D45EFD6E; Thu, 23 Jul 2020 19:29:06 -0700 (PDT) Received: from U203705.lan (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7BF4D3F66E; Thu, 23 Jul 2020 19:29:06 -0700 (PDT) From: "Samer El-Haj-Mahmoud" To: devel@edk2.groups.io Cc: G Edhaya Chandran , Eric Jin , Irene Park , Heinrich Schuchardt Subject: [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros Date: Thu, 23 Jul 2020 22:29:00 -0400 Message-Id: <20200724022900.30826-4-Samer.El-Haj-Mahmoud@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200724022900.30826-1-Samer.El-Haj-Mahmoud@arm.com> References: <20200724022900.30826-1-Samer.El-Haj-Mahmoud@arm.com> Remove the obsolete EFI_SPECIFICATION_VERSION and TIANO_RELEASE_VERSION macros, which are not passed in as command line arguments anymore. Cc: G Edhaya Chandran Cc: Eric Jin Cc: Irene Park Cc: Heinrich Schuchardt Signed-off-by: Samer El-Haj-Mahmoud --- uefi-sct/SctPkg/UEFI/IHV_SCT.dsc | 20 +++++++------- uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc | 28 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc index 6904dbe89bac..b9dba02e1748 100644 --- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc +++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc @@ -56,25 +56,25 @@ 0|DEFAULT # The entry: 0|DEFAULT is reserved and always required. [BuildOptions] - MSFT:*_*_IA32_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 /wd4133 /Od + MSFT:*_*_IA32_CC_FLAGS = /D EFI32 /wd4133 /Od MSFT:*_*_IA32_ASM_FLAGS = /DEFI32 - MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 - MSFT:*_*_IA32_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 - MSFT:*_*_IA32_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 + MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 + MSFT:*_*_IA32_APP_FLAGS = /D EFI32 + MSFT:*_*_IA32_PP_FLAGS = /D EFI32 - MSFT:*_*_X64_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 /wd4133 /Od + MSFT:*_*_X64_CC_FLAGS = /D EFIX64 /wd4133 /Od MSFT:*_*_X64_ASM_FLAGS = /DEFIX64 - MSFT:*_*_X64_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 - MSFT:*_*_X64_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 - MSFT:*_*_X64_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 + MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64 + MSFT:*_*_X64_APP_FLAGS = /D EFIX64 + MSFT:*_*_X64_PP_FLAGS = /D EFIX64 -# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32 +# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32 GCC:*_*_IA32_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error # GCC:*_*_IA32_VFRPP_FLAGS = -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_APP_FLAGS = -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_PP_FLAGS = -D EFI32 $(GCC_VER_MACRO) -# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64 +# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64 GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error # GCC:*_*_X64_VFRPP_FLAGS = -D EFIX64 $(GCC_VER_MACRO) diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc index eebed7507184..cc8ff4a65a78 100644 --- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc +++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc @@ -46,8 +46,8 @@ BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - DEFINE GCC_VER_MACRO = -D EFI_SPECIFICATION_VERSION=0x00020028 -D TIANO_RELEASE_VERSION=0x00080006 - DEFINE MSFT_VER_MACRO = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 + DEFINE GCC_VER_MACRO = + DEFINE MSFT_VER_MACRO = ################################################################################ @@ -60,25 +60,25 @@ 0|DEFAULT # The entry: 0|DEFAULT is reserved and always required. [BuildOptions] - MSFT:*_*_IA32_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 /wd4133 /Od - MSFT:*_*_IA32_ASM_FLAGS = /DEFI32 - MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 - MSFT:*_*_IA32_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 - MSFT:*_*_IA32_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 + MSFT:*_*_IA32_CC_FLAGS = /D EFI32 /wd4133 /Od + MSFT:*_*_IA32_ASM_FLAGS = /D EFI32 + MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32 + MSFT:*_*_IA32_APP_FLAGS = /D EFI32 + MSFT:*_*_IA32_PP_FLAGS = /D EFI32 - MSFT:*_*_X64_CC_FLAGS = /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 /wd4133 /Od - MSFT:*_*_X64_ASM_FLAGS = /DEFIX64 - MSFT:*_*_X64_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 - MSFT:*_*_X64_APP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 - MSFT:*_*_X64_PP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 + MSFT:*_*_X64_CC_FLAGS = /D EFIX64 /wd4133 /Od + MSFT:*_*_X64_ASM_FLAGS = /D EFIX64 + MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64 + MSFT:*_*_X64_APP_FLAGS = /D EFIX64 + MSFT:*_*_X64_PP_FLAGS = /D EFIX64 -# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32 +# GCC:*_*_IA32_CC_FLAGS = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32 GCC:*_*_IA32_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error # GCC:*_*_IA32_VFRPP_FLAGS = -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_APP_FLAGS = -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_PP_FLAGS = -D EFI32 $(GCC_VER_MACRO) -# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64 +# GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64 GCC:*_*_X64_CC_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -Wno-error # GCC:*_*_X64_VFRPP_FLAGS = -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_APP_FLAGS = -D EFIX64 $(GCC_VER_MACRO) -- 2.17.1