From: Marco Schlumpp Date: Fri, 24 Feb 2023 16:18:55 +0000 (+0100) Subject: plat/kvm: Remove intermediate relocatable object step X-Git-Tag: RELEASE-0.13.0~47 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c7c221dc66b124752250a39a677e4a9bbe3f2c24;p=unikraft%2Funikraft.git plat/kvm: Remove intermediate relocatable object step This object was previously used to hide all symbols except the entry point. But this step was removed making the relocatable object creation unnecessary. Signed-off-by: Marco Schlumpp Reviewed-by: Sergiu Moga Approved-by: Simon Kuenzer Tested-by: Unikraft CI GitHub-Closes: #789 --- diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk index b5afbe050..720e39ef8 100644 --- a/plat/kvm/Linker.uk +++ b/plat/kvm/Linker.uk @@ -33,8 +33,8 @@ $(KVM_DEBUG_IMAGE): $(KVM_ALIBS) $(KVM_ALIBS-y) $(KVM_OLIBS) $(KVM_OLIBS-y) \ $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y) \ $(KVM_LD_SCRIPT-y) $(EXTRA_LD_SCRIPT-y) \ $(UK_PLAT_KVM_DEF_LDS) - $(call build_cmd,LD,,$(KVM_IMAGE).o,\ - $(LD) -r $(LIBLDFLAGS) $(LIBLDFLAGS-y) \ + $(call build_cmd,LD,,$@,\ + $(LD) \ $(KVM_LDFLAGS) $(KVM_LDFLAGS-y) \ $(KVM_OLIBS) $(KVM_OLIBS-y) \ $(UK_OLIBS) $(UK_OLIBS-y) \ @@ -43,12 +43,9 @@ $(KVM_DEBUG_IMAGE): $(KVM_ALIBS) $(KVM_ALIBS-y) $(KVM_OLIBS) $(KVM_OLIBS-y) \ $(UK_ALIBS) $(UK_ALIBS-y) \ $(KVM_LINK_LIBGCC_FLAG) \ -Wl$(comma)--end-group \ - -o $(KVM_IMAGE).o) - $(call build_cmd,LD,,$@,\ - $(LD) $(LDFLAGS) $(LDFLAGS-y) \ - $(KVM_LDFLAGS) $(KVM_LDFLAGS-y) \ - $(KVM_LD_SCRIPT_FLAGS) \ - $(KVM_IMAGE).o -o $@) + $(LDFLAGS) $(LDFLAGS-y) \ + $(KVM_LD_SCRIPT_FLAGS) \ + -o $@) $(call build_bootinfo,$@) $(KVM_IMAGE): $(KVM_IMAGE).dbg @@ -74,5 +71,4 @@ UK_IMAGES-$(CONFIG_OPTIMIZE_COMPRESS) += $(KVM_IMAGE).gz endif # ...for cleaning: -LIBKVMPLAT_CLEAN += $(call build_clean,$(KVM_IMAGE).o) LIBKVMPLAT_CLEAN += $(call build_clean,$(KVM_DEBUG_IMAGE).bootinfo)