fixed GCC build issues

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@759 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2006-07-05 05:22:26 +00:00
parent b775e03a84
commit cfa5a9c5d1
6 changed files with 40 additions and 38 deletions

View File

@ -146,7 +146,7 @@
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName> <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>UINT32</DatumType> <DatumType>UINT32</DatumType>
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>0x10000000</Value> <Value>0x10000</Value>
</PcdData> </PcdData>
<PcdData ItemType="FIXED_AT_BUILD"> <PcdData ItemType="FIXED_AT_BUILD">
<C_Name>PcdMaximumUnicodeStringLength</C_Name> <C_Name>PcdMaximumUnicodeStringLength</C_Name>
@ -15100,7 +15100,7 @@
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK"> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}" "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"
</Option> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

View File

@ -4133,7 +4133,7 @@
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK"> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}" "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"
</Option> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

View File

@ -2613,7 +2613,7 @@
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK"> <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}"
</Option> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

View File

@ -840,7 +840,7 @@
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASM"> "--warn" </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="SLINK"> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK"> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="DLINK">
"-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}" "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"
</Option> </Option>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
<Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option> <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

View File

@ -136,7 +136,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<sequential> <sequential>
<cc userdefine="on"> <cc userdefine="on">
<command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}"> <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}" family="${PP_FAMILY}">
<EXTRA.INC/> <EXTRA.INC/>
<argument value="${PP_FLAGS}"/> <argument value="${PP_FLAGS}"/>
<fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/> <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
@ -211,7 +211,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<sequential> <sequential>
<cc userdefine="on"> <cc userdefine="on">
<command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}"> <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">
<EXTRA.INC.1/> <EXTRA.INC.1/>
<argument value="${PP_FLAGS}"/> <argument value="${PP_FLAGS}"/>
<fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/> <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
@ -283,7 +283,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<sequential> <sequential>
<cc userdefine="on"> <cc userdefine="on">
<command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}"> <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">
<EXTRA.INC.1/> <EXTRA.INC.1/>
<argument value="${PP_FLAGS}"/> <argument value="${PP_FLAGS}"/>
<fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/> <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
@ -522,7 +522,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<cc userdefine="on"> <cc userdefine="on">
<command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}"
includepathDelimiter="-I" includepathDelimiter="-I" family="${CC_FAMILY}"
outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" > outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >
<argument value="${CC_FLAGS}"/> <argument value="${CC_FLAGS}"/>
<EXTRA.INC/> <EXTRA.INC/>

View File

@ -25,8 +25,6 @@
*_MSFT_IA32_*_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE *_MSFT_IA32_*_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
#*_MSFT_IA32_ASM_EXT = .asm #*_MSFT_IA32_ASM_EXT = .asm
# DEBUG_MSFT_IA32_CC_PATH =
# x64 definitions # x64 definitions
*_MSFT_X64_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86\amd64 *_MSFT_X64_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86\amd64
*_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\ *_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\
@ -50,10 +48,14 @@
#*_GCC_*_CC_NAME = gcc #*_GCC_*_CC_NAME = gcc
#*_GCC_*_SLINK_NAME = ar #*_GCC_*_SLINK_NAME = ar
#*_GCC_*_DLINK_NAME = ld #*_GCC_*_DLINK_NAME = ld
#*_GCC_*_ASM_NAME = ml.exe
#*_GCC_*_PP_NAME=gcc
# GCC, IA32 # GCC, IA32
#*_GCC_IA32_*_PATH = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin #*_GCC_IA32_*_PATH = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin
#*_GCC_IA32_ASM_FAMILY = MSFT
#*_GCC_IA32_ASM_NAME = ml.exe
#*_GCC_IA32_ASM_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin #*_GCC_IA32_ASM_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
#*_GCC_IA32_ASM_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE #*_GCC_IA32_ASM_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
#*_GCC_IA32_PP_FAMILY = MSFT
#*_GCC_IA32_PP_NAME = cl.exe
#*_GCC_IA32_PP_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
#*_GCC_IA32_PP_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE