added GCC tool chain family options

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

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 8dd5c40ea7f79a450cef78bb8c930d06b011d679..b79706ff04cd3ad0af700028b6bc7397ba3ff3e5 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -4122,7 +4122,7 @@
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">\r
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">\r
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r

-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r

       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
       \r


@@ -4141,7 +4141,7 @@
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">\r
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">\r

-        "/P"\r
+        "/P", "/TC"\r

       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>\r
       \r


@@ -4157,7 +4157,7 @@
         "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"\r
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASMLINK"> </Option>\r
         "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"\r
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASMLINK"> </Option>\r

-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/P" </Option>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/P", "/TC" </Option>\r

       <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       <!-- INTC tool chain options definition : EBC -->\r
       <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       <!-- INTC tool chain options definition : EBC -->\r


@@ -4170,16 +4170,16 @@
       <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="DLINK">\r
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"\r
       </Option>\r
       <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="DLINK">\r
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"\r
       </Option>\r

-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="PP"> "/P" </Option>\r
+      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="PP"> "-P", "-TC" </Option>\r

         \r
       <!-- GCC tool chain options definition : IA32 -->\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">\r
         \r
       <!-- GCC tool chain options definition : IA32 -->\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">\r

-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"\r
+        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c", "-include ${DEST_DIR_DEBUG}/AutoGen.h"\r

       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">\r

-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r
+        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"\r

       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r