fixed GCC build issues

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

diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index 063dfe41ed20d856dfc6b3ea90b9f939731b6f63..f688eb7754d4d18392f897d5dd5cf6f0ee1d2cbe 100644 (file)
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -146,7 +146,7 @@
           <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>
           <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
           <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x10000000</Value>
+          <Value>0x10000</Value>

         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>


@@ -15100,7 +15100,7 @@
       <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 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", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"
+        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"

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

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 7fe5ec23010f4dbc137c1f15859c07b5eed4fcc6..e529128a51420049ed019b5fb16a79bdf11eeed5 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -4133,7 +4133,7 @@
       <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 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", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"\r
+        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"\r

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

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 6438740510ca4131fb8411b5770ce08a2345b207..61b18e686ff06e4754cd4753e3810461166a49cc 100644 (file)
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -2613,7 +2613,7 @@
       <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 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}"\r

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

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 48aa3772bcfdba3993b41355b9d2c6784a54afcb..69d3c809d503e6862ba5bb0f24eead8badee80a3 100644 (file)
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -840,7 +840,7 @@
       <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 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", "--entry ${ENTRYPOINT}", "--subsystem ${SUBSYSTEM}"\r
+        "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"\r

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

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 472290893165cb7ff46b44b5bd2c133d6d2ea9da..28d6f0cb040c46b999f6ad09951a63133e191b56 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -136,7 +136,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>\r
 \r
           <cc userdefine="on">\r
         <sequential>\r
 \r
           <cc userdefine="on">\r

-            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}">\r
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}" family="${PP_FAMILY}">\r

               <EXTRA.INC/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
               <EXTRA.INC/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r


@@ -211,7 +211,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
 \r
         <sequential>\r
           <cc userdefine="on">\r

-            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}">\r
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">\r

               <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
               <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r


@@ -283,7 +283,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
 \r
         <sequential>\r
           <cc userdefine="on">\r

-            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}">\r
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">\r

               <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
               <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r


@@ -522,7 +522,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     \r
           <cc userdefine="on">\r
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" \r
     \r
           <cc userdefine="on">\r
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" \r

-                     includepathDelimiter="-I"\r
+                     includepathDelimiter="-I" family="${CC_FAMILY}"\r

                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >\r
               <argument value="${CC_FLAGS}"/>\r
               <EXTRA.INC/>\r
                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >\r
               <argument value="${CC_FLAGS}"/>\r
               <EXTRA.INC/>\r

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 1ed9446499e53d46538d708184d29f083e871a95..2d08db301a3a024f51a653b49d293ab8521054a3 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -1,16 +1,16 @@
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>\r
 \r
 #Default values\r
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>\r
 \r
 #Default values\r

-*_MSFT_*_*_FAMILY = MSFT\r
-*_MSFT_*_ASL_FAMILY = INTEL\r
+*_MSFT_*_*_FAMILY       = MSFT\r
+*_MSFT_*_ASL_FAMILY     = INTEL\r

 \r
 \r

-*_MSFT_*_CC_NAME = cl.exe\r
-*_MSFT_*_SLINK_NAME = lib.exe\r
-*_MSFT_*_DLINK_NAME = link.exe\r
-*_MSFT_*_ASM_NAME = ml.exe\r
-*_MSFT_*_ASMLINK_NAME = link.exe\r
-*_MSFT_*_ASL_NAME = iasl.exe\r
-*_MSFT_*_PP_NAME = cl.exe\r
+*_MSFT_*_CC_NAME        = cl.exe\r
+*_MSFT_*_SLINK_NAME     = lib.exe\r
+*_MSFT_*_DLINK_NAME     = link.exe\r
+*_MSFT_*_ASM_NAME       = ml.exe\r
+*_MSFT_*_ASMLINK_NAME   = link.exe\r
+*_MSFT_*_ASL_NAME       = iasl.exe\r
+*_MSFT_*_PP_NAME        = cl.exe\r

 \r
 # HOST definitions\r
 #*_MSFT_HOST_*_PATH = C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\r
 \r
 # HOST definitions\r
 #*_MSFT_HOST_*_PATH = C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin\r


@@ -25,35 +25,37 @@
 *_MSFT_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 #*_MSFT_IA32_ASM_EXT     = .asm\r
 \r
 *_MSFT_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 #*_MSFT_IA32_ASM_EXT     = .asm\r
 \r

-# DEBUG_MSFT_IA32_CC_PATH = \r
-\r

 # x64 definitions\r
 *_MSFT_X64_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
 *_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\\r
 *_MSFT_X64_ASL_PATH     = C:\TianoTools\Bin\r
 # x64 definitions\r
 *_MSFT_X64_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86\amd64\r
 *_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\\r
 *_MSFT_X64_ASL_PATH     = C:\TianoTools\Bin\r

-*_MSFT_X64_ASM_NAME = ml64.exe\r
-*_MSFT_X64_ASM_EXT  = .asm\r
+*_MSFT_X64_ASM_NAME     = ml64.exe\r
+*_MSFT_X64_ASM_EXT      = .asm\r

 \r
 # IPF definitions\r
 \r
 # IPF definitions\r

-*_MSFT_IPF_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86\r
-*_MSFT_IPF_ASM_NAME = ias.exe\r
+*_MSFT_IPF_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86\r
+*_MSFT_IPF_ASM_NAME     = ias.exe\r

 \r
 # EBC definitions\r
 \r
 # EBC definitions\r

-*_MSFT_EBC_*_FAMILY = INTEL\r
-*_MSFT_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin\r
-*_MSFT_EBC_*_SPATH = C:\Progra~1\Intel\EBC\Lib\EbcLib.lib\r
-*_MSFT_EBC_CC_NAME = iec.exe\r
-*_MSFT_EBC_SLINK_NAME = link.exe\r
+*_MSFT_EBC_*_FAMILY     = INTEL\r
+*_MSFT_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin\r
+*_MSFT_EBC_*_SPATH      = C:\Progra~1\Intel\EBC\Lib\EbcLib.lib\r
+*_MSFT_EBC_CC_NAME      = iec.exe\r
+*_MSFT_EBC_SLINK_NAME   = link.exe\r

 \r
 # GCC definitions\r
 \r
 # GCC definitions\r

-#*_GCC_*_*_FAMILY = GCC\r
-#*_GCC_*_CC_NAME = gcc\r
-#*_GCC_*_SLINK_NAME = ar\r
-#*_GCC_*_DLINK_NAME = ld\r
-#*_GCC_*_ASM_NAME = ml.exe\r
-#*_GCC_*_PP_NAME=gcc\r
+#*_GCC_*_*_FAMILY       = GCC\r
+#*_GCC_*_CC_NAME        = gcc\r
+#*_GCC_*_SLINK_NAME     = ar\r
+#*_GCC_*_DLINK_NAME     = ld\r

 \r
 # GCC, IA32\r
 \r
 # GCC, IA32\r

-#*_GCC_IA32_*_PATH = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin\r
-#*_GCC_IA32_ASM_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
-#*_GCC_IA32_ASM_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+#*_GCC_IA32_*_PATH      = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin\r
+#*_GCC_IA32_ASM_FAMILY  = MSFT\r
+#*_GCC_IA32_ASM_NAME    = ml.exe\r
+#*_GCC_IA32_ASM_PATH    = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+#*_GCC_IA32_ASM_DPATH   = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
+#*_GCC_IA32_PP_FAMILY   = MSFT\r
+#*_GCC_IA32_PP_NAME     = cl.exe\r
+#*_GCC_IA32_PP_PATH     = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\r
+#*_GCC_IA32_PP_DPATH    = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r