[Minios-devel] [UNIKRAFT PATCHv5 44/46] plat/kvm: Update linker.uk to link image for Arm64

[Wei Chen <wei.chen@xxxxxxx>]

From: Wei Chen <Wei.Chen@xxxxxxx>

Update linker.uk to support link Arm64 image to aarch64elf
format.

Signed-off-by: Wei Chen <Wei.Chen@xxxxxxx>
---
 plat/kvm/Linker.uk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk
index fbadde2..006770f 100644
--- a/plat/kvm/Linker.uk
+++ b/plat/kvm/Linker.uk
@@ -1,9 +1,13 @@
 ifeq (x86_64,$(CONFIG_UK_ARCH))
-KVM_LDSCRIPT  := -Wl,-T,$(CONFIG_UK_BASE)/plat/kvm/x86/link64.lds
-KVM_LDSCRIPT_FLAGS := -Wl,-T,$(KVM_LDSCRIPT)
+KVM_LDSCRIPT  := $(CONFIG_UK_BASE)/plat/kvm/x86/link64.lds
 KVM_LDFLAGS-y += -Wl,-m,elf_x86_64
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+KVM_LDSCRIPT:= $(CONFIG_UK_BASE)/plat/kvm/arm/link64.lds
+KVM_LDFLAGS-y += -Wl,-m,aarch64elf
 endif
 
+KVM_LDSCRIPT_FLAGS := -Wl,-T,$(KVM_LDSCRIPT)
+
 ##
 ## Link image
 ##
@@ -14,7 +18,7 @@ $(KVM_IMAGE): $(KVM_LINK) $(KVM_LINK-y) $(UK_LINK) 
$(UK_LINK-y)
               $(LD) -r $(LIBLDFLAGS) $(LIBLDFLAGS-y) $(KVM_LDFLAGS) 
$(KVM_LDFLAGS-y) $^ -o $@.ld.o)
        $(call build_cmd,OBJCOPY,,$@.o,\
               $(OBJCOPY) -w -G kvmos_* -G _libkvmplat_entry $@.ld.o $@.o)
-ifeq (x86_64,$(CONFIG_UK_ARCH))
+ifneq ($(filter x86_64 arm64,$(CONFIG_UK_ARCH)),)
        $(call build_cmd,CC,,link64.lds.o,\
               $(CC) -E $(ASINCLUDES) $(ASFLAGS) $(ASFLAGS-y) -P 
$(KVM_LDSCRIPT).S -o $(KVM_LDSCRIPT))
        $(call build_cmd,LD,,$@,\
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel