1. Enhanced the format of build_rule.txt to allow module type and arch information.

2. Enhanced Trim to convert ASL style of include to C style of include
3. Enhanced Trim to convert some EDK coding convention to EDK2 ECP convention
4. Added warning message when encountering unrecognized content in DSC/DEC/INF File
5. Enhanced the GenDepex to ignore everything outside DEPENDENCY_STANT and DEPENDENCY_END in dxs file

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5634 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Bin/Win32/GenDepex.exe b/BaseTools/Bin/Win32/GenDepex.exe
index d11e4bf3fef12a82d32c84eb8e91cc97e3785ad5..dc0493ef2f87c6fe2553303fba61129319e705e1 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenDepex.exe and b/BaseTools/Bin/Win32/GenDepex.exe differ

diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe
index 33a91dad12cb813ef766597755fa89ca9381dc4c..60aa054f50f8686d91794e7a1edd711ec58a2b86 100755 (executable)
Binary files a/BaseTools/Bin/Win32/Trim.exe and b/BaseTools/Bin/Win32/Trim.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index a63d9b2926e70cf5c4f899714b0e24c3bc156abc..b87d444262772123c1c0c81b5f163655c2239e0c 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index c6cde8f2e5a4ff27204fd7806a21afb738759f54..385f0202708d2f80839f0b295050d8ffd78b8241 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2007, Intel Corporation\r
+#  Copyright (c) 2007-2008, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -17,17 +17,25 @@
 # "*" is used to indicate that the source files will be processed at the same time.\r
 # "?" is used to indicate that the source files will be processed one by one.\r
 #\r
-# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]" <EOL>\r
+# "[" <File-Type>[.<Build-Type>][.<Arch>][, <File-Type>[.<Build-Type>][.<Arch>]] "]" <EOL>\r
 #   <InputFile[.<ToolChainFamily>]> <EOL>\r
-#       [File-Type =] (?|*).<File-Extension> [(\n|,|;) (?|*).<File-Extension>]\r
+#       (?|*).<File-Extension> [(\n|,) (?|*).<File-Extension>]\r
 #\r
 #   <OutputFile[.<ToolChainFamily>]> <EOL>\r
 #       <FileFullPath>\r
 #\r
+#   <ExtraDependency>\r
+#       <FileFullPath>\r
+#\r
 #   <Command[.<ToolChainFamily>]> <EOL>\r
 #       <Command1>\r
 #       [<Command2>]\r
 #\r
+# <Build-Type> is the MODULE_TYPE in EDK2 or COMPONENT_TYPE  in EDK.\r
+# Missing <InputFile> will cause an exception and break build.\r
+# Missing <Command> will cause that related build target won't be generated but\r
+#   won't break build.\r
+#\r
 \r
 ## Placeholders for string substitution\r
 #\r
@@ -89,7 +97,7 @@
 #   Unicode-Text-File\r
 #\r
 \r
-[Build.C-Code-File]\r
+[C-Code-File]\r
     <InputFile>\r
         ?.c\r
         ?.C\r
@@ -98,6 +106,8 @@
         ?.cpp\r
         ?.Cpp\r
         ?.CPP\r
+\r
+    <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
@@ -109,24 +119,23 @@
     <Command.GCC>\r
         "$(CC)" -o ${dst} $(CC_FLAGS) $(INC) ${src}\r
 \r
-[Build.C-Header-File]\r
+[C-Header-File]\r
     <InputFile>\r
         *.h, *.H\r
 \r
     <OutputFile>\r
-        $(OUTPUT_DIR)(+)$(MODULE_NAME).gch\r
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 \r
     <Command>\r
 \r
 \r
-[Build.Assembly-Code-File]\r
+[Assembly-Code-File.COMMON.COMMON]\r
     <InputFile.MSFT, InputFile.INTEL>\r
-        Assembly-Code-File = ?.asm, ?.Asm, ?.ASM\r
-        $(MAKE_FILE)\r
+        ?.asm, ?.Asm, ?.ASM\r
 \r
     <InputFile.GCC>\r
         ?.S\r
+\r
+    <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
@@ -142,9 +151,11 @@
         Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii\r
 \r
-[Build.Iasm-Code-File]\r
+[Assembly-Code-File.COMMON.IPF]\r
     <InputFile>\r
         ?.s\r
+\r
+    <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
@@ -155,11 +166,13 @@
         Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
         "$(ASM)" -o ${dst} $(ASM_FLAGS) ${d_path}(+)${s_base}.iii\r
 \r
-[Build.Visual-Form-Representation-File]\r
+[Visual-Form-Representation-File]\r
     <InputFile>\r
         ?.vfr\r
         ?.Vfr\r
         ?.VFR\r
+\r
+    <ExtraDependency>\r
         $(MAKE_FILE)\r
 \r
     <OutputFile>\r
@@ -171,7 +184,7 @@
         -mkdir ${d_path} > NUL 2>&1\r
         "$(VFR)" $(VFR_FLAGS) --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
-[Build.Object-File]\r
+[Object-File]\r
     <InputFile>\r
         *.obj\r
         *.o\r
@@ -185,30 +198,11 @@
     <Command.GCC>\r
         "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src}\r
 \r
-#[Build.Object-File, Build.Static-Library-File]\r
-#BUILD_VERSION =  0x00010000\r
-#\r
-#    <InputFile>\r
-#       Object-File = *.obj\r
-#       Static-Library-File = *.lib, *.a\r
-#\r
-#    <OutputFile>\r
-#        $(OUTPUT_DIR)(+)$(MODULE_NAME).lib\r
-#\r
-#    <Command.MSFT>\r
-#        "$(SLINK)" /OUT:${dst} $(SLINK_FLAGS) ${src}\r
-#\r
-#    <Command.GCC>\r
-#        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)\r
-#\r
-[Build.Static-Library-File]\r
-    <InputFile.MSFT, InputFile.Intel>\r
+[Static-Library-File]\r
+    <InputFile>\r
         ?.lib\r
-        $(LIBS)\r
-        $(MAKE_FILE)\r
 \r
-    <InputFile.GCC>\r
-        ?.lib\r
+    <ExtraDependency>\r
         $(LIBS)\r
         $(MAKE_FILE)\r
 \r
@@ -221,7 +215,7 @@
     <Command.GCC>\r
         "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\) $(DLINK2_FLAGS)\r
 \r
-[Build.Dynamic-Library-File]\r
+[Dynamic-Library-File]\r
     <InputFile>\r
         ?.dll\r
 \r
@@ -234,7 +228,7 @@
         $(CP) ${dst} $(BIN_DIR)\r
         -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)\r
 \r
-[Build.Dependency-Expression-File]\r
+[Dependency-Expression-File]\r
     <InputFile>\r
         ?.dxs, ?.Dxs, ?.DXS\r
 \r
@@ -246,33 +240,42 @@
         Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
         GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
-[Build.Acpi-Source-Language-File]\r
+[Acpi-Source-Language-File]\r
     <InputFile>\r
         ?.asl, ?.Asl, ?.ASL\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_base}.aml\r
 \r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i\r
 \r
-[Build.Acpi-Table-Code-File]\r
+[Acpi-Table-Code-File]\r
     <InputFile>\r
         ?.aslc\r
 \r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_base}.acpi\r
 \r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
     <Command.MSFT, Command.INTEL>\r
         "$(CC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(INC) ${src}\r
         "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
-[Build.Masm16-Code-File]\r
+[Masm16-Code-File]\r
     <InputFile>\r
         ?.asm16, ?.Asm16, ?.ASM16\r
 \r
+    <ExtraDependency>\r
+        $(MAKE_FILE)\r
+\r
     <OutputFile>\r
         $(OUTPUT_DIR)(+)${s_base}.com\r
 \r
@@ -281,7 +284,7 @@
         "$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}\r
         "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,\r
 \r
-[Build.Microcode-File]\r
+[Microcode-File]\r
     <InputFile>\r
         ?.txt, ?.TXT, ?.Txt\r
 \r
@@ -291,7 +294,7 @@
     <Command>\r
         GenFw -o ${dst} -m ${src}\r
 \r
-[Build.Microcode-Binary-File]\r
+[Microcode-Binary-File]\r
     <InputFile>\r
         *.mcb\r
 \r
@@ -302,7 +305,7 @@
         GenFw -o ${dst} -j ${src}\r
         -$(CP) ${dst} $(BIN_DIR)\r
 \r
-[Build.Unicode-Text-File]\r
+[Unicode-Text-File]\r
     <InputFile>\r
         *.uni, *.Uni, *.UNI\r
 \r
@@ -312,3 +315,11 @@
 \r
     <Command>\r
 \r
+[EFI-Image-File]\r
+    <InputFile>\r
+        ?.efi, ?.Efi, ?.EFI\r
+\r
+    <OutputFile>\r
+\r
+    <Command>\r
+\r

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 51e599f5e815a6dbbad9479d5e2039202ba89397..8b52138a5f54b20c34868df140dc94badde54bdc 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -151,7 +151,7 @@ DEFINE ASL_BIN = C:\ASL
       *_VS2003_IA32_PP_FLAGS             = /nologo /E /TC /FIAutoGen.h\r
       *_VS2003_IA32_VFRPP_FLAGS          = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
   DEBUG_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Zi /Gm\r
-RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- \r
+RELEASE_VS2003_IA32_CC_FLAGS             = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX-\r
   DEBUG_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC /Zi /Gm\r
 RELEASE_VS2003_IA32_PCH_FLAGS            = /nologo /c /WX /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /GX- /Fp$(DEST_DIR_OUTPUT)/AutoGen.h.gch /Yc /TC\r
   DEBUG_VS2003_IA32_ASM_FLAGS            = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
@@ -195,9 +195,9 @@ RELEASE_VS2003_IA32_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 \r
   DEBUG_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_VS2005PRO_IA32_CC_FLAGS          = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd /Zi  \r
+  DEBUG_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2005PRO_IA32_ASM_FLAGS         = /nologo /c /WX /W3 /Cx /coff /Zd\r
-  DEBUG_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
+  DEBUG_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
       *_VS2005PRO_IA32_ASMLINK_FLAGS     = /nologo /tiny\r
 \r
@@ -215,7 +215,7 @@ RELEASE_VS2005PRO_IA32_DLINK_FLAGS       = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005PRO_X64_DLINK_PATH          = DEF(VS2005PRO_BINX64)\link.exe\r
 *_VS2005PRO_X64_ASMLINK_PATH        = DEF(VS2005PRO_BINX64)\link.exe\r
 \r
-  DEBUG_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_VS2005PRO_X64_CC_FLAGS           = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_VS2005PRO_X64_ASM_FLAGS          = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2005PRO_X64_ASM_FLAGS          = /nologo /c /WX /W3 /Cx /Zd\r
@@ -256,9 +256,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS        = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
       *_VS2005TEAMSUITE_IA32_MAKE_FLAGS  = /nologo\r
   DEBUG_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
 RELEASE_VS2005TEAMSUITE_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs8192 /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
-  DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi  \r
+  DEBUG_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2005TEAMSUITE_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
-  DEBUG_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG   \r
+  DEBUG_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG\r
 RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text\r
       *_VS2005TEAMSUITE_IA32_ASMLINK_FLAGS= /nologo /tiny\r
 \r
@@ -275,7 +275,7 @@ RELEASE_VS2005TEAMSUITE_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_VS2005TEAMSUITE_X64_SLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\lib.exe\r
 *_VS2005TEAMSUITE_X64_DLINK_PATH    = DEF(VS2005TEAMSUITE_BINX64)\link.exe\r
 \r
-  DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_VS2005TEAMSUITE_X64_CC_FLAGS     = /nologo /c /WX /GS- /X /W4 /Gs8192 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2005TEAMSUITE_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -459,6 +459,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_*_DLINK_FLAGS                = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20\r
 *_CYGWINGCC_*_ASM_FLAGS                  = -c -x assembler -imacros AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS                   = -E -x assembler-with-cpp -include AutoGen.h\r
+*_CYGWINGCC_*_APP_FLAGS                  = -E -x assembler\r
 *_CYGWINGCC_*_VFRPP_FLAGS                = -x c -E -P -DVFRCOMPILE --include AutoGen.h\r
 \r
 ##################\r
@@ -469,6 +470,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_IA32_DLINK_PATH         = DEF(CYGWIN_BIN32)/ld\r
 *_CYGWINGCC_IA32_ASM_PATH           = DEF(CYGWIN_BIN32)/gcc\r
 *_CYGWINGCC_IA32_PP_PATH            = DEF(CYGWIN_BIN32)/gcc\r
+*_CYGWINGCC_IA32_APP_PATH           = DEF(CYGWIN_BIN32)/gcc\r
 *_CYGWINGCC_IA32_VFRPP_PATH         = DEF(CYGWIN_BIN32)/gcc\r
 \r
 *_CYGWINGCC_IA32_CC_FLAGS           = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h\r
@@ -481,6 +483,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_CYGWINGCC_X64_DLINK_PATH          = DEF(CYGWIN_BINX64)/ld\r
 *_CYGWINGCC_X64_ASM_PATH            = DEF(CYGWIN_BINX64)/gcc\r
 *_CYGWINGCC_X64_PP_PATH             = DEF(CYGWIN_BINX64)/gcc\r
+*_CYGWINGCC_X64_APP_PATH            = DEF(CYGWIN_BINX64)/gcc\r
 *_CYGWINGCC_X64_VFRPP_PATH          = DEF(CYGWIN_BINX64)/gcc\r
 \r
 *_CYGWINGCC_X64_CC_FLAGS            = -Os -fshort-wchar -fno-strict-aliasing -mno-red-zone -Wall -Werror -c -include AutoGen.h -D_EFI_P64\r
@@ -664,7 +667,7 @@ RELEASE_ICC_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 \r
 *_MYTOOLS_*_ASL_PATH                = DEF(ASL_BIN)\iasl.exe\r
 \r
-*_MYTOOLS_*_ASL_FLAGS                    = \r
+*_MYTOOLS_*_ASL_FLAGS                    =\r
 *_MYTOOLS_*_MAKE_FLAGS                   = /nologo\r
 *_MYTOOLS_*_VFRPP_FLAGS                  = /nologo /E /TC /DVFRCOMPILE /FIAutoGen.h\r
 *_MYTOOLS_*_APP_FLAGS                    = /nologo /E /TC\r
@@ -692,7 +695,7 @@ RELEASE_MYTOOLS_*_ASM16_FLAGS     = /nologo /c /WX /W3 /coff /Cx /Zd
 *_MYTOOLS_IA32_APP_PATH             = DEF(VS2005TEAMSUITE_BIN)\cl.exe\r
 *_MYTOOLS_IA32_ASM_PATH             = DEF(VS2005TEAMSUITE_BIN)\ml.exe\r
 \r
-  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd /Zi\r
 RELEASE_MYTOOLS_IA32_ASM_FLAGS           = /nologo /c /WX /W3 /coff /Cx /Zd\r
@@ -714,7 +717,7 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_X64_APP_PATH              = DEF(VS2005TEAMSUITE_BINX64)\cl.exe\r
 *_MYTOOLS_X64_ASM_PATH              = DEF(VS2005TEAMSUITE_BINX64)\ml64.exe\r
 \r
-  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm \r
+  DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs8192 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
   DEBUG_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_MYTOOLS_X64_ASM_FLAGS            = /nologo /c /WX /W3 /Cx /Zd\r
@@ -737,7 +740,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
       *_MYTOOLS_IPF_ASM_OUTPUT           = "-o "\r
 \r
   DEBUG_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 /Zi\r
-RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32 \r
+RELEASE_MYTOOLS_IPF_CC_FLAGS             = /nologo /c /WX /GS- /X /W4 /Gy /Ox /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zx /QIPF_fr32\r
   DEBUG_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4 -d debug\r
 RELEASE_MYTOOLS_IPF_ASM_FLAGS            = -N us -X explicit -M ilp64 -N so -W4\r
   DEBUG_MYTOOLS_IPF_DLINK_FLAGS          = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF /OPT:ICF=10 /IGNORE:4086 /MAP /ALIGN:32 /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG\r