summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--EdkModulePkg/EdkModulePkg-All-Archs.fpd23
-rw-r--r--EdkModulePkg/EdkModulePkg.fpd10
-rw-r--r--MdePkg/MdePkg-All-Archs.fpd24
-rw-r--r--MdePkg/MdePkg.fpd2
4 files changed, 6 insertions, 53 deletions
diff --git a/EdkModulePkg/EdkModulePkg-All-Archs.fpd b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
index 84cbe8926e..275b41219b 100644
--- a/EdkModulePkg/EdkModulePkg-All-Archs.fpd
+++ b/EdkModulePkg/EdkModulePkg-All-Archs.fpd
@@ -15733,29 +15733,6 @@
</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", "-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", "--entry ${ENTRYPOINT}"
- </Option>
- <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
- <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-x assembler-with-cpp", "-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">
diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index bf875e95eb..f941ad44b9 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -1839,7 +1839,7 @@
<FfsFormatKey>BS_DRIVER</FfsFormatKey>
</ModuleSaBuildOptions>
</ModuleSA>
- <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="911D584C-35F7-4955-BEF9-B452769DDC3A">
+ <!--ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="911D584C-35F7-4955-BEF9-B452769DDC3A">
<Libraries>
<Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
<Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -1919,7 +1919,7 @@
<FvBinding>NULL</FvBinding>
<FfsFormatKey>BS_DRIVER</FfsFormatKey>
</ModuleSaBuildOptions>
- </ModuleSA>
+ </ModuleSA-->
<ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="9E863906-A40F-4875-977F-5B93FF237FC6">
<Libraries>
<Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -2668,7 +2668,7 @@
<FfsFormatKey>BS_DRIVER</FfsFormatKey>
</ModuleSaBuildOptions>
</ModuleSA>
- <ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7">
+ <!--ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7">
<Libraries>
<Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
<Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -2750,7 +2750,7 @@
<FvBinding>NULL</FvBinding>
<FfsFormatKey>BS_DRIVER</FfsFormatKey>
</ModuleSaBuildOptions>
- </ModuleSA>
+ </ModuleSA-->
<ModuleSA SupArchList="IA32" PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674" ModuleGuid="EBf342FE-B1D3-4EF8-957C-8048606FF670">
<Libraries>
<Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -4149,7 +4149,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}"
+ "-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", "-x assembler-with-cpp", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>
diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index bf2ddb09e6..0ff0002473 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -2605,30 +2605,6 @@
"/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB", "/ENTRY:${ENTRYPOINT}", "/SUBSYSTEM:${SUBSYSTEM}"
</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", "-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", "--entry ${ENTRYPOINT}"
- </Option>
- <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>
- <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-x assembler-with-cpp", "-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">
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 5147b6cfaa..d03de71960 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}"
+ "-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", "-x assembler-with-cpp", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 18:14:22 +0000