ArmVirtPkg: move to unified GCC linker script

Move to the parametrised generic GCC linker script and set 64 KB
alignment, instead of using the AARCH64 specific incremental linker
script for 64 KB alignment which is about to be removed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18140 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index b2003a58be04ac30ad9e993d86f1b9a2dd365307..8c54242b597b45e2b93269022c6597a5116e6a8f 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -18,7 +18,7 @@
   DEFINE TTY_TERMINAL            = FALSE\r
 \r
 [BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER]\r
-  GCC:*_*_AARCH64_DLINK_FLAGS = --script=$(EDK_TOOLS_PATH)/Scripts/gcc-aarch64-64K-align-ld-script\r
+  GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000\r
 \r
 [LibraryClasses.common]\r
 !if $(TARGET) == RELEASE\r