1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[mirror_edk2.git] / EdkCompatibilityPkg / Sample / CommonTools.env

diff --git a/EdkCompatibilityPkg/Sample/CommonTools.env b/EdkCompatibilityPkg/Sample/CommonTools.env
index 2d97156a024bc36b823c3bc6dd959160412169c2..2ad41fdd77cc99f8b7d66859b53f212f8342942c 100644 (file)
--- a/EdkCompatibilityPkg/Sample/CommonTools.env
+++ b/EdkCompatibilityPkg/Sample/CommonTools.env
@@ -74,12 +74,14 @@ PCCTS_DIR         = $(EDK_SOURCE)\Other\Maintained\Tools\Pccts
 #\r
 ANTLR           = $(PCCTS_DIR)\bin\antlr\r
 DLG             = $(PCCTS_DIR)\bin\dlg\r
 #\r
 ANTLR           = $(PCCTS_DIR)\bin\antlr\r
 DLG             = $(PCCTS_DIR)\bin\dlg\r

+EXE2BIN         = $(EDK_TOOLS_OUTPUT)\Strip\r

 FWIMAGE         = $(EDK_TOOLS_OUTPUT)\FwImage\r
 GENDEPEX        = $(EDK_TOOLS_OUTPUT)\GenDepex\r
 GENFDIMAGE      = $(EDK_TOOLS_OUTPUT)\GenFdImage\r
 GENFFSFILE      = $(EDK_TOOLS_OUTPUT)\GenFfsFile\r
 GENFVIMAGE      = $(EDK_TOOLS_OUTPUT)\GenFvImage\r
 GENSECTION      = $(EDK_TOOLS_OUTPUT)\GenSection\r
 FWIMAGE         = $(EDK_TOOLS_OUTPUT)\FwImage\r
 GENDEPEX        = $(EDK_TOOLS_OUTPUT)\GenDepex\r
 GENFDIMAGE      = $(EDK_TOOLS_OUTPUT)\GenFdImage\r
 GENFFSFILE      = $(EDK_TOOLS_OUTPUT)\GenFfsFile\r
 GENFVIMAGE      = $(EDK_TOOLS_OUTPUT)\GenFvImage\r
 GENSECTION      = $(EDK_TOOLS_OUTPUT)\GenSection\r

+GENTEIMAGE      = $(EDK_TOOLS_OUTPUT)\GenTEImage\r

 GUIDCHK         = $(EDK_TOOLS_OUTPUT)\GuidChk\r
 MAKEDEPS        = $(EDK_TOOLS_OUTPUT)\MakeDeps\r
 PROCESSDSC      = $(EDK_TOOLS_OUTPUT)\ProcessDsc\r
 GUIDCHK         = $(EDK_TOOLS_OUTPUT)\GuidChk\r
 MAKEDEPS        = $(EDK_TOOLS_OUTPUT)\MakeDeps\r
 PROCESSDSC      = $(EDK_TOOLS_OUTPUT)\ProcessDsc\r


@@ -127,20 +129,27 @@ C_FLAGS_ASL       = /nologo /EP /C
 # in the platform specific macros (xxx_PROJ_FLAGS)\r
 #\r
 C_STD_INCLUDE       = /X\r
 # in the platform specific macros (xxx_PROJ_FLAGS)\r
 #\r
 C_STD_INCLUDE       = /X\r

+\r

 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r
 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r

+\r

 !IF "$(USE_VC8)" == "YES"\r
 !IF "$(USE_VC8)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /GS- /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r

 !ELSE\r
 !ELSE\r

-C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /GX- /GR- /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r

 !ENDIF\r
 !ENDIF\r

+ASM_STD_FLAGS       = /nologo /Fl$*.lst $(INC)\r
+\r

 !ELSE\r
 !ELSE\r

+\r

 !IF "$(USE_VC8)" == "YES"\r
 !IF "$(USE_VC8)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /GS- /D USE_VC8 /c /Fo$@ $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /D USE_VC8 /c /Fo$@ $(INC)\r

 !ELSE\r
 !ELSE\r

-C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)\r
-!ENDIF\r
+C_STD_FLAGS         = /nologo /W4 /WX /GX- /GR- /Gy /c /Fo$@ $(INC)\r

 !ENDIF\r
 ASM_STD_FLAGS       = /nologo $(INC) \r
 !ENDIF\r
 ASM_STD_FLAGS       = /nologo $(INC) \r

+\r
+!ENDIF\r
+\r

 LINK_STD_FLAGS      = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF /BASE:0 /IGNORE:4001,4078,4086,4096,4108 $(BUILD_DIR)\IA32\CompilerStub.lib\r
 LIB_STD_FLAGS       = /nologo \r
 \r
 LINK_STD_FLAGS      = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF /BASE:0 /IGNORE:4001,4078,4086,4096,4108 $(BUILD_DIR)\IA32\CompilerStub.lib\r
 LIB_STD_FLAGS       = /nologo \r
 \r


@@ -204,11 +213,12 @@ LINK_STD_FLAGS      = $(LINK_STD_FLAGS) /DEBUG
 #\r
 C_STD_INCLUDE       = /X\r
 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r
 #\r
 C_STD_INCLUDE       = /X\r
 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /Gy /c /GS- /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC) \r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /c /GS- /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC) \r
+ASM_STD_FLAGS       = /nologo /Fl$*.lst $(INC)\r

 !ELSE\r
 !ELSE\r

-C_STD_FLAGS         = /nologo /W4 /WX /Gy /c /GS- /Fo$@ $(INC) \r
-!ENDIF\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /c /GS- /Fo$@ $(INC) \r

 ASM_STD_FLAGS       = /nologo $(INC)\r
 ASM_STD_FLAGS       = /nologo $(INC)\r

+!ENDIF\r

 LINK_STD_FLAGS      = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF /BASE:0 /IGNORE:4001,4078,4086,4096,4108 $(BUILD_DIR)\X64\CompilerStub.lib\r
 LIB_STD_FLAGS       = /nologo \r
 \r
 LINK_STD_FLAGS      = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF /BASE:0 /IGNORE:4001,4078,4086,4096,4108 $(BUILD_DIR)\X64\CompilerStub.lib\r
 LIB_STD_FLAGS       = /nologo \r
 \r


@@ -288,26 +298,31 @@ LINK_STD_FLAGS      = $(LINK_STD_FLAGS) /DEBUG
 # in the platform specific macros (xxx_PROJ_FLAGS)\r
 #\r
 C_STD_INCLUDE       = /X\r
 # in the platform specific macros (xxx_PROJ_FLAGS)\r
 #\r
 C_STD_INCLUDE       = /X\r

+\r

 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r
 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r

+\r

 !IF "$(USE_VC8_IPF)" == "YES"\r
 !IF "$(USE_VC8_IPF)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r

 !ELSE\r
 !IF "$(USE_NEWDDK)" == "YES"\r
 !ELSE\r
 !IF "$(USE_NEWDDK)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r

 !ELSE\r
 !ELSE\r

-C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /GX- /GR- /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r

 !ENDIF\r
 !ENDIF\r
 !ENDIF\r
 !ENDIF\r

+\r

 !ELSE\r
 !ELSE\r

+\r

 !IF "$(USE_VC8_IPF)" == "YES"\r
 !IF "$(USE_VC8_IPF)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fo$@ $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fo$@ $(INC)\r

 !ELSE\r
 !IF "$(USE_NEWDDK)" == "YES"\r
 !ELSE\r
 !IF "$(USE_NEWDDK)" == "YES"\r

-C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /GS- /c /Fo$@ $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /EHs-c- /GR- /Gy /GS- /c /Fo$@ $(INC)\r

 !ELSE\r
 !ELSE\r

-C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)\r
+C_STD_FLAGS         = /nologo /W4 /WX /GX- /GR- /Gy /c /Fo$@ $(INC)\r

 !ENDIF\r
 !ENDIF\r
 !ENDIF\r
 !ENDIF\r

+\r

 !ENDIF\r
 \r
 ASM_STD_FLAGS       = $(INC) \r
 !ENDIF\r
 \r
 ASM_STD_FLAGS       = $(INC) \r


@@ -389,19 +404,25 @@ LINK_STD_FLAGS      = $(LINK_STD_FLAGS) /DEBUG
 # in the platform specific macros (xxx_PROJ_FLAGS)\r
 #\r
 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r
 # in the platform specific macros (xxx_PROJ_FLAGS)\r
 #\r
 !IF "$(EFI_GENERATE_INTERMEDIATE_FILE)" == "YES"\r

+\r

 !IF "$(USE_VC8)" == "YES"\r
 C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /D _CRT_SECURE_NO_DEPRECATE /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
 !ELSE\r
 C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
 !ENDIF\r
 !IF "$(USE_VC8)" == "YES"\r
 C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /D _CRT_SECURE_NO_DEPRECATE /D USE_VC8 /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
 !ELSE\r
 C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fa$* /FAsc /Fo$@ /FR$(@R).SBR $(INC)\r
 !ENDIF\r

+ASM_STD_FLAGS       = /nologo /Fl$*.lst $(INC)\r
+\r

 !ELSE\r
 !ELSE\r

+\r

 !IF "$(USE_VC8)" == "YES"\r
 C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /D _CRT_SECURE_NO_DEPRECATE /D USE_VC8 /c /Fo$@ $(INC)\r
 !ELSE\r
 C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)\r
 !ENDIF\r
 !IF "$(USE_VC8)" == "YES"\r
 C_STD_FLAGS         = /nologo /W4 /WX /EHsc /Gy /D _CRT_SECURE_NO_DEPRECATE /D USE_VC8 /c /Fo$@ $(INC)\r
 !ELSE\r
 C_STD_FLAGS         = /nologo /W4 /WX /GX /Gy /c /Fo$@ $(INC)\r
 !ENDIF\r

-!ENDIF\r

 ASM_STD_FLAGS       = /nologo $(INC)\r
 ASM_STD_FLAGS       = /nologo $(INC)\r

+\r
+!ENDIF\r
+\r

 LINK_STD_FLAGS      = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF\r
 LIB_STD_FLAGS       = /nologo \r
 \r
 LINK_STD_FLAGS      = /nologo /SUBSYSTEM:CONSOLE /NODEFAULTLIB /MAP /OPT:REF\r
 LIB_STD_FLAGS       = /nologo \r
 \r


@@ -552,50 +573,69 @@ VERSION_FLAGS       = /D EFI_SPECIFICATION_VERSION=$(EFI_SPECIFICATION_VERSION)
                       /D TIANO_RELEASE_VERSION=$(TIANO_RELEASE_VERSION)\r
 C_STD_FLAGS         = $(C_STD_FLAGS) $(VERSION_FLAGS)\r
 EBC_C_STD_FLAGS     = $(EBC_C_STD_FLAGS) $(VERSION_FLAGS)\r
                       /D TIANO_RELEASE_VERSION=$(TIANO_RELEASE_VERSION)\r
 C_STD_FLAGS         = $(C_STD_FLAGS) $(VERSION_FLAGS)\r
 EBC_C_STD_FLAGS     = $(EBC_C_STD_FLAGS) $(VERSION_FLAGS)\r

+C_FLAGS_ASL         = $(C_FLAGS_ASL) $(VERSION_FLAGS)\r

 VFRCOMPILE_FLAGS    = $(VFRCOMPILE_FLAGS) -ppflag "$(VERSION_FLAGS)"\r
 VFRCOMPILE_FLAGS    = $(VFRCOMPILE_FLAGS) -ppflag "$(VERSION_FLAGS)"\r

+!IF "$(TOOLCHAIN)" != "TOOLCHAIN_IPF"\r
+ASM_STD_FLAGS       = $(ASM_STD_FLAGS) $(VERSION_FLAGS)\r
+!ENDIF\r

 \r
 !IF "$(EFI_DEBUG)" == "YES"\r
 \r
 !IF "$(EFI_DEBUG)" == "YES"\r

-C_STD_FLAGS         = $(C_STD_FLAGS) /D EFI_DEBUG\r
-EBC_C_STD_FLAGS     = $(EBC_C_STD_FLAGS) /D EFI_DEBUG\r
-VFRCOMPILE_FLAGS    = $(VFRCOMPILE_FLAGS) -ppflag "/D EFI_DEBUG"\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_DEBUG\r

 !ENDIF\r
 \r
 !IF "$(EFI_DEBUG_CLEAR_MEMORY)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_DEBUG_CLEAR_MEMORY)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_DEBUG_CLEAR_MEMORY\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_DEBUG_CLEAR_MEMORY\r

 !ENDIF\r
 \r
 !IF "$(EFI_PEI_PERFORMANCE)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_PEI_PERFORMANCE)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_PEI_PERFORMANCE /D EFI_DXE_PERFORMANCE\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_PEI_PERFORMANCE /D EFI_DXE_PERFORMANCE\r

 !ENDIF\r
 \r
 !IF "$(EFI_ADDTIONAL_DRIVERS)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_ADDTIONAL_DRIVERS)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_ADDTIONAL_DRIVERS\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_ADDTIONAL_DRIVERS\r

 !ENDIF\r
 \r
 !IF "$(EFI_USE_CUSTOM_COMPRESS)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_USE_CUSTOM_COMPRESS)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_USE_CUSTOM_COMPRESS\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_USE_CUSTOM_COMPRESS\r

 !ENDIF\r
 \r
 !IF "$(EFI_UNLOCK_FWH)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_UNLOCK_FWH)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_UNLOCK_FWH\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_UNLOCK_FWH\r

 !ENDIF\r
 \r
 !IF "$(EFI_DXE_PERFORMANCE)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_DXE_PERFORMANCE)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_DXE_PERFORMANCE\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_DXE_PERFORMANCE\r

 !ENDIF\r
 \r
 !ENDIF\r
 \r

-!IF "$(EFI_DEBUG_SERIAL_PRINT)" == "YES"\r
-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_DEBUG_SERIAL_PRINT\r
+!IF "$(EFI_S3_RESUME)" == "YES"\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_S3_RESUME\r

 !ENDIF\r
 \r
 !ENDIF\r
 \r

-!IF "$(EFI_S3_RESUME)" == "YES"\r
-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_S3_RESUME\r
+!IF "$(EFI_SIZE_REDUCTION_APPLIED)" == "YES"\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_SIZE_REDUCTION_APPLIED\r

 !ENDIF\r
 \r
 !IF "$(EFI_PEI_REPORT_STATUS_CODE)" == "YES"\r
 !ENDIF\r
 \r
 !IF "$(EFI_PEI_REPORT_STATUS_CODE)" == "YES"\r

-C_STD_FLAGS     = $(C_STD_FLAGS) /D EFI_PEI_REPORT_STATUS_CODE_ON\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D EFI_PEI_REPORT_STATUS_CODE_ON\r

 !ENDIF\r
 \r
 !ENDIF\r
 \r

+!IF "$(SIZE_REDUCTION_ISA_COMBINED)" == "YES"\r
+FEATURE_FLAGS   = $(FEATURE_FLAGS) /D SIZE_REDUCTION_ISA_COMBINED\r
+!ENDIF\r
+\r
+C_STD_FLAGS       = $(C_STD_FLAGS) $(FEATURE_FLAGS)\r
+EBC_C_STD_FLAGS   = $(EBC_C_STD_FLAGS) $(FEATURE_FLAGS)\r
+C_FLAGS_ASL       = $(C_FLAGS_ASL) $(FEATURE_FLAGS)\r
+VFRCOMPILE_FLAGS  = $(VFRCOMPILE_FLAGS) -ppflag "$(FEATURE_FLAGS)"\r
+!IF "$(TOOLCHAIN)" != "TOOLCHAIN_IPF"\r
+ASM_STD_FLAGS     = $(ASM_STD_FLAGS) $(FEATURE_FLAGS)\r
+!ENDIF\r
+\r
+#\r
+# This is used for preprocessing dependency files\r
+#\r
+C_FLAGS_DPX       = /nologo /EP $(INC) $(VERSION_FLAGS) $(FEATURE_FLAGS)\r
+\r

 ###############################################################################\r
 \r
 ###############################################################################\r
 ###############################################################################\r
 \r
 ###############################################################################\r


@@ -666,7 +706,7 @@ COMPRESS_METHOD               = Dummy
 #                                                                                       \r
 ###############################################################################  \r
 !IFNDEF EFI_BINARY\r
 #                                                                                       \r
 ###############################################################################  \r
 !IFNDEF EFI_BINARY\r

-EFI_BINARY=$(EDK_TOOLS_OUTPUT)\Bin\r
+EFI_BINARY=$(EDK_SOURCE)\Bin\r

 !ENDIF\r
 \r
 EFI_PLATFORM_BIN=$(EFI_BINARY)\$(PROJECT_NAME)$(BUILD_TARGET_DIRECTORY)\r
 !ENDIF\r
 \r
 EFI_PLATFORM_BIN=$(EFI_BINARY)\$(PROJECT_NAME)$(BUILD_TARGET_DIRECTORY)\r