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 <edhaya.chand...@arm.com>
Cc: Eric Jin <eric....@intel.com>
Cc: Irene Park <ip...@nvidia.com>
Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@arm.com>
---
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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#63223): https://edk2.groups.io/g/devel/message/63223
Mute This Topic: https://groups.io/mt/75759597/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
