[Minios-devel] [UNIKRAFT/LIBCOMPILER-RT PATCH 1/1] Changes for ARM64 support

[Vlad-Andrei BĂDOIU (78692) <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>]

This patch makes the minimum amount of changes needed to support ARM64.
Now we compile the cpu_model.c source file only under x86-64.

Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
---
 Config.uk   | 1 +
 Makefile.uk | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Config.uk b/Config.uk
index 7b0cfc7..bf576fa 100644
--- a/Config.uk
+++ b/Config.uk
@@ -1,5 +1,6 @@
 menuconfig LIBCOMPILER_RT
     bool " compiler-rt - runtime support"
+    select UKSYSINFO
     default n
 
 if LIBCOMPILER_RT
diff --git a/Makefile.uk b/Makefile.uk
index 558a03e..b929f6a 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -69,9 +69,6 @@ CXXINCLUDES-$(CONFIG_LIBCOMPILER_RT) += 
-I$(LIBCOMPILER_RT_SRC)/include
 
################################################################################
 # Global flags
 
################################################################################
-CONFIG_FLAGS   += -D__x86_64__
-LIBCOMPILER_RT_CFLAGS-y    +=  $(CONFIG_FLAGS)
-LIBCOMPILER_RT_CXXFLAGS-y    +=  $(CONFIG_FLAGS)
 
 LIBCOMPILER_RT_SUPPRESS_FLAGS += -Wno-unused-parameter
 LIBCOMPILER_RT_CFLAGS-y   += $(LIBCOMPILER_RT_SUPPRESS_FLAGS)
@@ -101,7 +98,7 @@ LIBCOMPILER_RT_SRCS-y += 
$(LIBCOMPILER_RT_SRC)/lib/builtins/fixunsdfdi.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/udivmodti4.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/floattisf.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/mulodi4.c
-LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/cpu_model.c
+LIBCOMPILER_RT_SRCS-$(CONFIG_ARCH_X86_64) += 
$(LIBCOMPILER_RT_SRC)/lib/builtins/cpu_model.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/fixunsxfsi.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/fixunstfdi.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/extendsftf2.c
@@ -235,6 +232,9 @@ LIBCOMPILER_RT_SRCS-y += 
$(LIBCOMPILER_RT_SRC)/lib/builtins/fixsfdi.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/fixdfti.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/floatdidf.c
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/extendsfdf2.c
+LIBCOMPILER_RT_SRCS-$(CONFIG_ARCH_X86_64) += 
$(LIBCOMPILER_RT_SRC)/lib/builtins/x86_64/chkstk2.S
+LIBCOMPILER_RT_SRCS-$(CONFIG_ARCH_X86_64) += 
$(LIBCOMPILER_RT_SRC)/lib/builtins/x86_64/chkstk.S
+
 ifdef CONFIG_LIBCOMPILER_RT_ATOMIC
 LIBCOMPILER_RT_SRCS-y += $(LIBCOMPILER_RT_SRC)/lib/builtins/atomic.c
 endif
-- 
2.20.1


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