[Minios-devel] [UNIKRAFT PATCHv4 41/43] plat/kvm: Update linker.uk to link image for Arm64

[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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk
index 2292b03..ef08b2c 100644
--- a/plat/kvm/Linker.uk
+++ b/plat/kvm/Linker.uk
@@ -1,6 +1,9 @@
 ifeq (x86_64,$(CONFIG_UK_ARCH))
 KVM_LDSCRIPT  := -Wl,-T,$(CONFIG_UK_BASE)/plat/kvm/x86/link64.ld
 KVM_LDFLAGS-y += -Wl,-m,elf_x86_64
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+KVM_LDSCRIPT  := -Wl,-T,$(CONFIG_UK_BASE)/plat/kvm/arm/link64.ld
+KVM_LDFLAGS-y += -Wl,-m,aarch64elf
 endif
 
 ##
@@ -13,7 +16,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,LD,,$@,\
               $(LD) $(LDFLAGS) $(LDFLAGS-y) $(KVM_LDFLAGS) $(KVM_LDFLAGS-y) 
$(KVM_LDSCRIPT) $@.o -o $@)
 ifeq ($(CONFIG_OPTIMIZE_DBGFILE),y)
-- 
2.17.1


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