Re: [Minios-devel] [UNIKRAFT PATCH v3 5/8] build: Automatically preprocess *.ldS

[Felipe Huici <Felipe.Huici@xxxxxxxxx>]

Hi Sharan, this patch looks good.

Reviewed-by: Felipe Huici <felipe.huici@xxxxxxxxx>

-- Felipe

On 12.08.19, 16:04, "Minios-devel on behalf of Sharan Santhanam" 
<minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx on behalf of 
Sharan.Santhanam@xxxxxxxxx> wrote:

    As a part of processing the *.ldS source file, the build system
    introduces LIBNAME_LDS-y and LIBNAME_LDS variables for automatically
    tracking dependency between library and sources.
    
    Signed-off-by: Sharan Santhanam <sharan.santhanam@xxxxxxxxx>
    ---
     plat/kvm/Linker.uk           | 3 +--
     plat/linuxu/Linker.uk        | 3 +--
     plat/xen/Linker.uk           | 3 +--
     support/build/Makefile.rules | 5 ++++-
     4 files changed, 7 insertions(+), 7 deletions(-)
    
    diff --git a/plat/kvm/Linker.uk b/plat/kvm/Linker.uk
    index 9c292acc..ccdd7433 100644
    --- a/plat/kvm/Linker.uk
    +++ b/plat/kvm/Linker.uk
    @@ -18,8 +18,7 @@ KVM_LD_SCRIPT_FLAGS += $(addprefix -Wl$(comma)-T$(comma),\
                        $(KVM_LD_SCRIPT-y) $(EXTRA_LD_SCRIPT-y))
     
     $(KVM_DEBUG_IMAGE): $(KVM_ALIBS) $(KVM_ALIBS-y) $(KVM_OLIBS) 
$(KVM_OLIBS-y) \
    -               $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y) \
    -               $(KVM_LDSCRIPT)
    +               $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y)
        $(call build_cmd,LD,,$(KVM_IMAGE).ld.o,\
               $(LD) -r $(LIBLDFLAGS) $(LIBLDFLAGS-y) \
                        $(KVM_LDFLAGS) $(KVM_LDFLAGS-y) \
    diff --git a/plat/linuxu/Linker.uk b/plat/linuxu/Linker.uk
    index 8674b006..d8b380ea 100644
    --- a/plat/linuxu/Linker.uk
    +++ b/plat/linuxu/Linker.uk
    @@ -11,8 +11,7 @@ LINUXU_LD_SCRIPT_FLAGS := $(addprefix 
-Wl$(comma)-T$(comma),\
     
     $(LINUXU_DEBUG_IMAGE): $(LINUXU_ALIBS) $(LINUXU_ALIBS-y) \
                       $(LINUXU_OLIBS) $(LINUXU_OLIBS-y) \
    -                  $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y) \
    -                  $(LINUXU_LDSCRIPT)
    +                  $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y)
        $(call build_cmd,LD,,$@,\
               $(LD) $(LDFLAGS) $(LDFLAGS-y) \
                     $(LINUXU_LDFLAGS) $(LINUXU_LDFLAGS-y) \
    diff --git a/plat/xen/Linker.uk b/plat/xen/Linker.uk
    index b67b45b7..0cc1fdce 100644
    --- a/plat/xen/Linker.uk
    +++ b/plat/xen/Linker.uk
    @@ -20,8 +20,7 @@ XEN_LD_SCRIPT_FLAGS += $(addprefix -Wl$(comma)-T$(comma),\
                         $(XEN_LD_SCRIPT-y) $(EXTRA_LD_SCRIPT-y))
     
     $(XEN_DEBUG_IMAGE): $(XEN_ALIBS) $(XEN_ALIBS-y) $(XEN_OLIBS) 
$(XEN_OLIBS-y) \
    -               $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y) \
    -               $(XEN_LDSCRIPT)
    +               $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y)
        $(call build_cmd,LD,,$(XEN_IMAGE).ld.o,\
               $(LD) -r $(LIBLDFLAGS) $(LIBLDFLAGS-y) \
                        $(XEN_LDFLAGS) $(XEN_LDFLAGS-y) \
    diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules
    index 3147f4cc..d10cf10b 100644
    --- a/support/build/Makefile.rules
    +++ b/support/build/Makefile.rules
    @@ -430,6 +430,7 @@ $(3): $(2) | prepare
     
     UK_SRCS-y += $(2)
     UK_DEPS-y += $(call out2dep,$(3))
    +$(eval $(call vprefix_lib,$(1),LDS-y) += $(3))
     $(eval $(call vprefix_lib,$(1),CLEAN-y) += $(call build_clean,$(3)) $(call 
out2dep,$(3)))
     endef
     
    @@ -584,7 +585,9 @@ $(if $(wildcard $($(call vprefix_lib,$(1),EXPORTS))),,\
     $(call libname2preolib,$(1)): $($(call vprefix_lib,$(1),OBJS)) \
                              $($(call vprefix_lib,$(1),OBJS-y)) \
                              $($(call vprefix_lib,$(1),ALIBS)) \
    -                         $($(call vprefix_lib,$(1),ALIBS-y))
    +                         $($(call vprefix_lib,$(1),ALIBS-y)) \
    +                         $($(call vprefix_lib,$(1),LDS)) \
    +                         $($(call vprefix_lib,$(1),LDS-y))
        $(call build_cmd,LD,,$(call libname2preolib,$(1)),\
                $(LD) $(LIBLDFLAGS) $(LIBLDFLAGS-y) \
                      $($(call vprefix_lib,$(1),LDFLAGS)) \
    -- 
    2.20.1
    
    
    _______________________________________________
    Minios-devel mailing list
    Minios-devel@xxxxxxxxxxxxxxxxxxxx
    https://lists.xenproject.org/mailman/listinfo/minios-devel

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