The BuildOptions for AARCH64 in Application/Shell/Shell.inf only affect
the core Shell binary, and not the Shell component libraries which are
merged into the final Shell binary via NULL library class resolution.

This means we need to override the UEFI_APPLICATION build options in
the platform .DSC anyway, there is no point in setting these options
here as well. So remove them.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 ShellPkg/Application/Shell/Shell.inf | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ShellPkg/Application/Shell/Shell.inf 
b/ShellPkg/Application/Shell/Shell.inf
index 253bfdbb224e..131200cb6a23 100644
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -108,10 +108,3 @@ [Pcd]
   gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole           ## CONSUMES
   gEfiShellPkgTokenSpaceGuid.PcdShellSupplier               ## CONSUMES
   gEfiShellPkgTokenSpaceGuid.PcdShellMaxHistoryCommandCount ## CONSUMES
-
-[BuildOptions.AARCH64]
-  # The tiny code model used by AARCH64 only supports binaries of up to 1 MB in
-  # size. Since the Shell application exceeds that when built in DEBUG mode,
-  # make sure we build it using the small code model instead.
-  GCC:DEBUG_*_*_CC_FLAGS = -mcmodel=small
-  GCC:DEBUG_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-- 
2.5.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to