plat/kvm,xen: Use LDLIBS-y for -lgcc option

Use `KVM_LDLIBS-y` and `XEN_LDLIBS-y` for the `-lgcc` linker option.
Instead of the custom flags `KVM_LINK_LIBGCC_FLAG` and
`XEN_LINK_LIBGCC_FLAG`.

Signed-off-by: Razvan Deaconescu <razvand@unikraft.io>
Reviewed-by: Oleksii Moisieiev <oleksii_moisieiev@epam.com>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Michalis Pappas <michalis@unikraft.io>
GitHub-Closes: #1525

diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk
index 7223fd89fbf50f64e11489237e34e2ffabe2b53b..c764e47aa00bde9fca97782a5076f31827ff69e2 100644 (file)
--- a/plat/kvm/Linker.uk
+++ b/plat/kvm/Linker.uk
@@ -16,11 +16,11 @@ endif
 ifeq ($(CONFIG_KVM_BOOT_PROTO_EFI_STUB),y)
 KVM_LDFLAGS-y += -Wl,--entry=uk_efi_entry64
 KVM_LDFLAGS-y += -Wl,-m,aarch64elf
-KVM_LINK_LIBGCC_FLAG := -lgcc
+KVM_LDLIBS-y += -lgcc
 else
 KVM_LDFLAGS-y += -Wl,--entry=_libkvmplat_entry
 KVM_LDFLAGS-y += -Wl,-m,aarch64elf
-KVM_LINK_LIBGCC_FLAG := -lgcc
+KVM_LDLIBS-y += -lgcc
 endif
 endif
 
@@ -59,8 +59,8 @@ $(KVM_DEBUG_IMAGE): $(KVM_ALIBS) $(KVM_ALIBS-y) $(KVM_OLIBS) $(KVM_OLIBS-y) \
                        -Wl$(comma)--start-group \
                        $(KVM_ALIBS) $(KVM_ALIBS-y) \
                        $(UK_ALIBS) $(UK_ALIBS-y) \
-                       $(KVM_LINK_LIBGCC_FLAG) \
                        -Wl$(comma)--end-group \
+                       $(KVM_LDLIBS) $(KVM_LDLIBS-y) \
                        $(LDFLAGS) $(LDFLAGS-y) \
                        $(KVM_LD_SCRIPT_FLAGS) \
                        -o $@)

diff --git a/plat/xen/Linker.uk b/plat/xen/Linker.uk
index acad4922fcef2288cfa7c5114f368da4f7685465..c90892e2f8330863de5a37a0e9c59b7462db5fc4 100644 (file)
--- a/plat/xen/Linker.uk
+++ b/plat/xen/Linker.uk
@@ -1,7 +1,8 @@
 ifeq (x86_64,$(CONFIG_UK_ARCH))
 XEN_LDFLAGS-y += -Wl,-m,elf_x86_64
 else ifeq (arm64,$(CONFIG_UK_ARCH))
-XEN_LINK_LIBGCC_FLAG := -lgcc
+XEN_LDFLAGS-y += -Wl,-m,aarch64elf
+XEN_LDLIBS-y += -lgcc
 endif
 
 ##
@@ -39,8 +40,8 @@ $(XEN_DEBUG_IMAGE): $(XEN_ALIBS) $(XEN_ALIBS-y) $(XEN_OLIBS) $(XEN_OLIBS-y) \
                        -Wl$(comma)--start-group \
                        $(XEN_ALIBS) $(XEN_ALIBS-y) \
                        $(UK_ALIBS) $(UK_ALIBS-y) \
-                       $(XEN_LINK_LIBGCC_FLAG) \
                        -Wl$(comma)--end-group \
+                       $(XEN_LDLIBS) $(XEN_LDLIBS-y) \
                        -o $(XEN_IMAGE).ld.o)
        $(call build_cmd,OBJCOPY,,$(XEN_IMAGE).o,\
                $(OBJCOPY) -w -G xenos_* -G _libxenplat_zimageboot \