ShellPkg AARCH64: remove DEBUG BuildOptions override

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.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

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