Added "/FI", "-include" and/or "/nologo" options to PP (CC) command option to fpd...

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

diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index a40c309e00a7a4985fc87905f15bd8b5dd041ca7..063dfe41ed20d856dfc6b3ea90b9f939731b6f63 100644 (file)
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -15043,8 +15043,8 @@
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
       </Option>
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASM">
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
       </Option>

-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
-      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>

       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
       
       <!-- MSFT tool chain options definition : X64 -->
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
       
       <!-- MSFT tool chain options definition : X64 -->


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

-        "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
+        "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"

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


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

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

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


@@ -15091,19 +15091,19 @@
       <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="DLINK">
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"
       </Option>
       <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="DLINK">
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"
       </Option>

-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-P", "-TC" </Option>
+      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-nologo", "-P", "-TC" </Option>

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

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

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

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

       </Option>
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
       </Option>
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>

-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>
+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

 
       <!-- BOB tool chain options definition : IA32 -->
       <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">
 
       <!-- BOB tool chain options definition : IA32 -->
       <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index b79706ff04cd3ad0af700028b6bc7397ba3ff3e5..1e16c2a38b1b39920bca6f1e1ec057e1c29e0805 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -4123,55 +4123,9 @@
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\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="ASMLINK"/>\r

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

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

-      <!-- MSFT tool chain options definition : X64 -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">\r
-        "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="SLINK">\r
-        "/NOLOGO"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="DLINK">\r
-        "/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASM">\r
-        "/nologo", "/W3", "/WX", "/c", "/DEFI32"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">\r
-        "/P", "/TC"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- MSFT tool chain options definition : IPF -->\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">\r
-        "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="SLINK"> "/NOLOGO" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="DLINK">\r
-        "/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"\r
-      </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASM">\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", "/TC" </Option>\r
-      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>\r
-      \r
-      <!-- INTC tool chain options definition : EBC -->\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="CC">\r
-        "-nologo", "-FAcs", "-c", "-W3", "-WX"\r
-      </Option>\r
-      <Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="SLINK">\r
-        "/lib", "/NOLOGO", "/MACHINE:EBC"\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", "-TC" </Option>\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", "-include ${DEST_DIR_DEBUG}/AutoGen.h"\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", "-include ${DEST_DIR_DEBUG}/AutoGen.h"\r


@@ -4182,19 +4136,8 @@
         "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\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 ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r

 \r
 \r

-      <!-- BOB tool chain options definition : IA32 -->\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">\r
-        "-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"\r
-      </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="SLINK"> </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="DLINK">\r
-        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r
-      </Option>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option TagName="BOB" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r

     </Options>\r
     \r
          <Ffs FfsKey="APPLICATION">\r
     </Options>\r
     \r
          <Ffs FfsKey="APPLICATION">\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index ff59bd8b71b4f48ccb86ce6378fb1e97a544d595..82cbafa255138c4068f2eaa1d3fcd81721ed3bdd 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -18,7 +18,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r
   <PlatformDefinitions>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r
   <PlatformDefinitions>\r

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r

     <BuildTargets>DEBUG</BuildTargets>\r
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>\r
     <OutputDirectory/>\r
     <BuildTargets>DEBUG</BuildTargets>\r
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>\r
     <OutputDirectory/>\r


@@ -6569,7 +6569,7 @@
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r

-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r

       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       <!-- MSFT tool chain options definition : IA32 -->\r
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       <!-- MSFT tool chain options definition : IA32 -->\r


@@ -6584,7 +6584,7 @@
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r

-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r

       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
     </Options>\r
 \r
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
     </Options>\r
 \r

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 8c507e5468b968ed27ed11b754c9d5c90390439d..6837147de5f526a8cced7f198f0243fb6350338a 100644 (file)
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -2556,8 +2556,8 @@
       <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="PP"> "/P", "/TC" </Option>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r

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


@@ -2575,7 +2575,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", "/TC"\r
+        "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"\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


@@ -2591,7 +2591,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", "/TC" </Option>\r
+      <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="PP"> "/nologo", "/P", "/TC" </Option>\r

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


@@ -2604,11 +2604,11 @@
       <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="DLINK">\r
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"\r
       </Option>\r
       <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="DLINK">\r
         "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"\r
       </Option>\r

-      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-P", "-TC" </Option>\r
+      <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="PP"> "-nologo", "-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>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>\r


@@ -2616,7 +2616,7 @@
         "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r
         "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"\r
       </Option>\r
       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>\r

-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E" </Option>\r
+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r

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


@@ -2781,4 +2781,4 @@
          \r
     <Sections />\r
   </BuildOptions>\r
          \r
     <Sections />\r
   </BuildOptions>\r

-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>\r

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index e8adb5415e1acfa6e4ae7a5e9e4f2bd4ab3f5fea..7b5ac2e4dbd8210b858f90bbeb7918c90aba8281 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 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="ASMLINK"/>\r\r

       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r\r
       \r\r
       <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </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
       <!-- 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
       </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>\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
 \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
     </Options>\r\r
     \r\r
          <Ffs FfsKey="APPLICATION">\r\r