[Minios-devel] [UNIKRAFT PATCH v4 1/7] plat/linuxu: make linker script preprocessable

[Florian Schmidt <florian.schmidt@xxxxxxxxx>]

Commit 1d84f3dd98e ("build: make all linker scripts preprocessable")
introduced preprocessable linker scripts for the Xen and KVM platform.
This follows the same approach to make the main linuxu linker script
preprocessable.

Signed-off-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
---
 plat/linuxu/Linker.uk                        | 8 ++++----
 plat/linuxu/Makefile.uk                      | 4 ++++
 plat/linuxu/arm/{link.lds => link.lds.S}     | 0
 plat/linuxu/x86/{link64.lds => link64.lds.S} | 0
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename plat/linuxu/arm/{link.lds => link.lds.S} (100%)
 rename plat/linuxu/x86/{link64.lds => link64.lds.S} (100%)

diff --git a/plat/linuxu/Linker.uk b/plat/linuxu/Linker.uk
index dcdd3be2..abbc781e 100644
--- a/plat/linuxu/Linker.uk
+++ b/plat/linuxu/Linker.uk
@@ -4,14 +4,14 @@ LINUXU_LDFLAGS-y += -Wl,-e,_liblinuxuplat_start
 ## Link image
 ##
 LINUXU_IMAGE := $(BUILD_DIR)/$(CONFIG_UK_NAME)_linuxu-$(CONFIG_UK_ARCH)
-LINUXU_LD_SCRIPT-$(CONFIG_ARCH_X86_64) += $(LIBLINUXUPLAT_BASE)/x86/link64.lds
-LINUXU_LD_SCRIPT-$(CONFIG_ARCH_ARM_32) += $(LIBLINUXUPLAT_BASE)/arm/link.lds
+LINUXU_LDSCRIPT := $(call src2lds,liblinuxuplat,$(LINUXU_LDSCRIPT_SRC-y))
 LINUXU_LD_SCRIPT_FLAGS := $(addprefix -Wl$(comma)-T$(comma),\
-                           $(LINUXU_LD_SCRIPT-y) $(EXTRA_LD_SCRIPT-y))
+                           $(LINUXU_LDSCRIPT) $(EXTRA_LD_SCRIPT-y))
 
 $(LINUXU_IMAGE): $(LINUXU_ALIBS) $(LINUXU_ALIBS-y) \
                 $(LINUXU_OLIBS) $(LINUXU_OLIBS-y) \
-                $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y)
+                $(UK_ALIBS) $(UK_ALIBS-y) $(UK_OLIBS) $(UK_OLIBS-y) \
+                $(LINUXU_LDSCRIPT)
        $(call build_cmd,LD,,$@.dbg,\
               $(LD) $(LDFLAGS) $(LDFLAGS-y) \
                     $(LINUXU_LDFLAGS) $(LINUXU_LDFLAGS-y) \
diff --git a/plat/linuxu/Makefile.uk b/plat/linuxu/Makefile.uk
index 2c0de76c..ee3a7ea1 100644
--- a/plat/linuxu/Makefile.uk
+++ b/plat/linuxu/Makefile.uk
@@ -20,6 +20,9 @@ LIBLINUXUPLAT_ASFLAGS             += -DLINUXUPLAT
 LIBLINUXUPLAT_CFLAGS              += -DLINUXUPLAT
 LIBLINUXUPLAT_CXXFLAGS            += -DLINUXUPLAT
 
+LINUXU_LDSCRIPT_SRC-$(CONFIG_ARCH_X86_64) += 
$(LIBLINUXUPLAT_BASE)/x86/link64.lds.S
+LINUXU_LDSCRIPT_SRC-$(CONFIG_ARCH_ARM_32) += 
$(LIBLINUXUPLAT_BASE)/arm/link.lds.S
+
 LIBLINUXUPLAT_SRCS-$(CONFIG_ARCH_X86_64) += 
$(UK_PLAT_COMMON_BASE)/x86/cpu_features.c|common
 LIBLINUXUPLAT_SRCS-$(CONFIG_ARCH_X86_32) += $(LIBLINUXUPLAT_BASE)/x86/entry32.S
 LIBLINUXUPLAT_SRCS-$(CONFIG_ARCH_X86_64) += $(LIBLINUXUPLAT_BASE)/x86/entry64.S
@@ -40,3 +43,4 @@ LIBLINUXUPLAT_SRCS-y              += 
$(LIBLINUXUPLAT_BASE)/time.c
 LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/lcpu.c|common
 LIBLINUXUPLAT_SRCS-y              += $(UK_PLAT_COMMON_BASE)/memory.c|common
 LIBLINUXUPLAT_SRCS-y              += $(LIBLINUXUPLAT_BASE)/io.c
+LIBLINUXUPLAT_SRCS-y              += $(LINUXU_LDSCRIPT_SRC-y)
diff --git a/plat/linuxu/arm/link.lds b/plat/linuxu/arm/link.lds.S
similarity index 100%
rename from plat/linuxu/arm/link.lds
rename to plat/linuxu/arm/link.lds.S
diff --git a/plat/linuxu/x86/link64.lds b/plat/linuxu/x86/link64.lds.S
similarity index 100%
rename from plat/linuxu/x86/link64.lds
rename to plat/linuxu/x86/link64.lds.S
-- 
2.21.0


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