Added "/FI", "-include" and/or "/nologo" options to PP (CC) command option to fpd files. These changes are used to accommodate the preprocessing added for assembly code as a general processing step.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@749 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2006-07-04 16:28:26 +00:00
parent d3dfaf4b45
commit 525c51880f
5 changed files with 25 additions and 139 deletions

View File

@ -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 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 -->
@ -15062,7 +15062,7 @@
</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>
@ -15078,7 +15078,7 @@
"-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 -->
@ -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="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">
"-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">
"-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 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">

View File

@ -4123,55 +4123,9 @@
"/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
<!-- MSFT tool chain options definition : X64 -->
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">
"/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="SLINK">
"/NOLOGO"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="DLINK">
"/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASM">
"/nologo", "/W3", "/WX", "/c", "/DEFI32"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">
"/P", "/TC"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>
<!-- MSFT tool chain options definition : IPF -->
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">
"/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="SLINK"> "/NOLOGO" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="DLINK">
"/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASM">
"-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="ASL"> "/nologo" </Option>
<!-- INTC tool chain options definition : EBC -->
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="CC">
"-nologo", "-FAcs", "-c", "-W3", "-WX"
</Option>
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="SLINK">
"/lib", "/NOLOGO", "/MACHINE:EBC"
</Option>
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="DLINK">
"/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"
</Option>
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="PP"> "-P", "-TC" </Option>
<!-- GCC tool chain options definition : IA32 -->
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="CC">
"-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c", "-include ${DEST_DIR_DEBUG}/AutoGen.h"
@ -4182,19 +4136,8 @@
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"
</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">
"-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"
</Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="SLINK"> </Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="DLINK">
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"
</Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option TagName="BOB" SupArchList="IA32" ToolCode="PP"> "-E" </Option>
</Options>
<Ffs FfsKey="APPLICATION">

View File

@ -18,7 +18,7 @@
<Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052</Specification>
</PlatformHeader>
<PlatformDefinitions>
<SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
<SupportedArchitectures>IA32</SupportedArchitectures>
<BuildTargets>DEBUG</BuildTargets>
<IntermediateDirectories>UNIFIED</IntermediateDirectories>
<OutputDirectory/>
@ -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"
</Option>
<Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
<Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>
<Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
<!-- MSFT tool chain options definition : IA32 -->
@ -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"
</Option>
<Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
<Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>
<Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
</Options>

View File

@ -2556,8 +2556,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 BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
<!-- MSFT tool chain options definition : X64 -->
@ -2575,7 +2575,7 @@
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">
"/P", "/TC"
"/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>
@ -2591,7 +2591,7 @@
"-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 -->
@ -2604,11 +2604,11 @@
<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">
"-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>
@ -2616,7 +2616,7 @@
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"
</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">

View File

@ -829,79 +829,22 @@
<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="ASMLINK"/>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>
<!-- MSFT tool chain options definition : X64 -->
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">
"/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="SLINK">
"/NOLOGO"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="DLINK">
"/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASM">
"/nologo", "/W3", "/WX", "/c", "/DEFI32"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASMLINK"> </Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="PP">
"/P"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="ASL"> "/nologo" </Option>
<!-- MSFT tool chain options definition : IPF -->
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">
"/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="SLINK"> "/NOLOGO" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="DLINK">
"/NOLOGO", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"
</Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASM">
"-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" </Option>
<Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="ASL"> "/nologo" </Option>
<!-- INTC tool chain options definition : EBC -->
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="CC">
"-nologo", "-FAcs", "-c", "-W3", "-WX"
</Option>
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="SLINK">
"/lib", "/NOLOGO", "/MACHINE:EBC"
</Option>
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="DLINK">
"/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"
</Option>
<Option ToolChainFamily="INTC" SupArchList="EBC" ToolCode="PP"> "/P" </Option>
<!-- 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">
"-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 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">
"-Os", "-fshort-wchar", "-fno-strict-aliasing", "-Wall", "-Werror", "-c"
</Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="SLINK"> </Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="DLINK">
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"
</Option>
<Option TagName="BOB" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option TagName="BOB" SupArchList="IA32" ToolCode="PP"> "-E" </Option>
</Options>
<Ffs FfsKey="APPLICATION">