diff options
| author | jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-09 06:17:20 +0000 |
|---|---|---|
| committer | jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-09 06:17:20 +0000 |
| commit | 1cda74acbf8554882be74536c421fa860e337ed7 (patch) | |
| tree | 509d39303c2efb3ed3048f792d611d52035fa4e1 /EdkModulePkg | |
| parent | bf0ce309d12976a2c36335118b183cc5d38bdc00 (diff) | |
| download | edk2-1cda74acbf8554882be74536c421fa860e337ed7.tar.gz edk2-1cda74acbf8554882be74536c421fa860e337ed7.tar.bz2 edk2-1cda74acbf8554882be74536c421fa860e337ed7.zip | |
Added a "_" to ${ENTRYPOINT} for GCC "CC" command option;
Removed GCC tool chain options from MdePkg-All-Archs.fpd and EdkModulePkg-All-Archs.fpd
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@843 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg')
| -rw-r--r-- | EdkModulePkg/EdkModulePkg-All-Archs.fpd | 23 | ||||
| -rw-r--r-- | EdkModulePkg/EdkModulePkg.fpd | 10 |
2 files changed, 5 insertions, 28 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> |