summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--EdkModulePkg/EdkModulePkg-All-Archs.fpd4
-rw-r--r--EdkModulePkg/EdkModulePkg.fpd2
-rw-r--r--MdePkg/MdePkg-All-Archs.fpd2
-rw-r--r--MdePkg/MdePkg.fpd2
-rw-r--r--Tools/Conf/BuildMacro.xml8
-rw-r--r--Tools/Conf/tools_def.template60
6 files changed, 40 insertions, 38 deletions
diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index 063dfe41ed..f688eb7754 100644
--- 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>
- <Value>0x10000000</Value>
+ <Value>0x10000</Value>
</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">
- "-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>
diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 7fe5ec2301..e529128a51 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -4133,7 +4133,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">
- "-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>
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 6438740510..61b18e686f 100644
--- 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>
<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}"
</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/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 48aa3772bc..69d3c809d5 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -840,7 +840,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">
- "-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>
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 4722908931..28d6f0cb04 100644
--- 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>
<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/>
<argument value="${PP_FLAGS}"/>
<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>
<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/>
<argument value="${PP_FLAGS}"/>
<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>
<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/>
<argument value="${PP_FLAGS}"/>
<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">
<command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}"
- includepathDelimiter="-I"
+ includepathDelimiter="-I" family="${CC_FAMILY}"
outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >
<argument value="${CC_FLAGS}"/>
<EXTRA.INC/>
diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 1ed9446499..2d08db301a 100644
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -1,16 +1,16 @@
# format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>
#Default values
-*_MSFT_*_*_FAMILY = MSFT
-*_MSFT_*_ASL_FAMILY = INTEL
+*_MSFT_*_*_FAMILY = MSFT
+*_MSFT_*_ASL_FAMILY = INTEL
-*_MSFT_*_CC_NAME = cl.exe
-*_MSFT_*_SLINK_NAME = lib.exe
-*_MSFT_*_DLINK_NAME = link.exe
-*_MSFT_*_ASM_NAME = ml.exe
-*_MSFT_*_ASMLINK_NAME = link.exe
-*_MSFT_*_ASL_NAME = iasl.exe
-*_MSFT_*_PP_NAME = cl.exe
+*_MSFT_*_CC_NAME = cl.exe
+*_MSFT_*_SLINK_NAME = lib.exe
+*_MSFT_*_DLINK_NAME = link.exe
+*_MSFT_*_ASM_NAME = ml.exe
+*_MSFT_*_ASMLINK_NAME = link.exe
+*_MSFT_*_ASL_NAME = iasl.exe
+*_MSFT_*_PP_NAME = cl.exe
# HOST definitions
#*_MSFT_HOST_*_PATH = C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin
@@ -25,35 +25,37 @@
*_MSFT_IA32_*_DPATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
#*_MSFT_IA32_ASM_EXT = .asm
-# DEBUG_MSFT_IA32_CC_PATH =
-
# x64 definitions
*_MSFT_X64_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86\amd64
*_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\
*_MSFT_X64_ASL_PATH = C:\TianoTools\Bin
-*_MSFT_X64_ASM_NAME = ml64.exe
-*_MSFT_X64_ASM_EXT = .asm
+*_MSFT_X64_ASM_NAME = ml64.exe
+*_MSFT_X64_ASM_EXT = .asm
# IPF definitions
-*_MSFT_IPF_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86
-*_MSFT_IPF_ASM_NAME = ias.exe
+*_MSFT_IPF_*_PATH = C:\WINDDK\3790.1830\bin\win64\x86
+*_MSFT_IPF_ASM_NAME = ias.exe
# EBC definitions
-*_MSFT_EBC_*_FAMILY = INTEL
-*_MSFT_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin
-*_MSFT_EBC_*_SPATH = C:\Progra~1\Intel\EBC\Lib\EbcLib.lib
-*_MSFT_EBC_CC_NAME = iec.exe
-*_MSFT_EBC_SLINK_NAME = link.exe
+*_MSFT_EBC_*_FAMILY = INTEL
+*_MSFT_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin
+*_MSFT_EBC_*_SPATH = C:\Progra~1\Intel\EBC\Lib\EbcLib.lib
+*_MSFT_EBC_CC_NAME = iec.exe
+*_MSFT_EBC_SLINK_NAME = link.exe
# GCC definitions
-#*_GCC_*_*_FAMILY = GCC
-#*_GCC_*_CC_NAME = gcc
-#*_GCC_*_SLINK_NAME = ar
-#*_GCC_*_DLINK_NAME = ld
-#*_GCC_*_ASM_NAME = ml.exe
-#*_GCC_*_PP_NAME=gcc
+#*_GCC_*_*_FAMILY = GCC
+#*_GCC_*_CC_NAME = gcc
+#*_GCC_*_SLINK_NAME = ar
+#*_GCC_*_DLINK_NAME = ld
# GCC, IA32
-#*_GCC_IA32_*_PATH = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\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_*_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_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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 18:15:08 +0000