supplemented "/FI" to some ignored PP options in fpd files

[mirror_edk2.git] / MdePkg / MdePkg.fpd

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index e8adb5415e1acfa6e4ae7a5e9e4f2bd4ab3f5fea..48aa3772bcfdba3993b41355b9d2c6784a54afcb 100644 (file)
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -829,79 +829,22 @@
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">\r\r
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r\r
       </Option>\r\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r\r
       \r\r
-      <!-- MSFT tool chain options definition : X64 -->\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">\r\r
-        "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="SLINK">\r\r
-        "/NOLOGO"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="DLINK">\r\r
-        "/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASM">\r\r
-        "/nologo", "/W3", "/WX", "/c", "/DEFI32"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">\r\r
-        "/P"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>\r\r
-      \r\r
-      <!-- MSFT tool chain options definition : IPF -->\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">\r\r
-        "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="SLINK"> "/NOLOGO" </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="DLINK">\r\r
-        "/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASM">\r\r
-        "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASMLINK"> </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/P" </Option>\r\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>\r\r
-      \r\r
-      <!-- INTC tool chain options definition : EBC -->\r\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="CC">\r\r
-        "-nologo", "-FAcs", "-c", "-W3", "-WX"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="SLINK">\r\r
-        "/lib", "/NOLOGO", "/MACHINE:EBC"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="DLINK">\r\r
-        "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"\r\r
-      </Option>\r\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="PP"> "/P" </Option>\r\r
-        \r\r
       <!-- GCC tool chain options definition : IA32 -->\r\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">\r\r
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"\r\r
+        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c", "-include ${DEST_DIR_DEBUG}/AutoGen.h"\r\r
       </Option>\r\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>\r\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">\r\r
-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r\r
+        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"\r
       </Option>\r\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r\r
-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r\r
+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r\r
 \r\r
-      <!-- BOB tool chain options definition : IA32 -->\r\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">\r\r
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"\r\r
-      </Option>\r\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="SLINK"> </Option>\r\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="DLINK">\r\r
-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r\r
-      </Option>\r\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="ASMLINK"/>\r\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r\r
     </Options>\r\r
     \r\r
          <Ffs FfsKey="APPLICATION">\r\r