[Minios-devel] [UNIKRAFT/GCC PATCH 09/14] libgo: Wait for patches to be applied and update library depedencies

[Charalampos Mainas <Charalampos.Mainas@xxxxxxxxx>]

Patches should be applied before starting building go packages.
Update depedencies on library's config file.

Signed-off-by: Charalampos Mainas <Charalampos.Mainas@xxxxxxxxx>
---
 Config.uk   | 11 ++++++++++-
 Makefile.uk |  8 ++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Config.uk b/Config.uk
index edb6a00..d5792a5 100644
--- a/Config.uk
+++ b/Config.uk
@@ -4,7 +4,13 @@ menuconfig LIBGCC
        select LIBNOLIBC if !HAVE_LIBC
        select LIBUKDEBUG
        select LIBUKALLOC
-       select LIBPTHREAD_EMBEDDED
+       select LIBUNWIND
+       select LIBCOMPILER_RT
+       select LIBCXX
+       select LIBCXXABI
+       select LIBNEWLIB
+       select LIBUKMMAP
+       select UKSYSINFO
 
 if LIBGCC
 
@@ -15,6 +21,8 @@ config LIBGO
        select LIBUCONTEXT
        select LIBBACKTRACE
        select LIBFFI
+       select UKUNISTD
+       select LIBSYSCALL_SHIM
 if LIBGO
 endif
 
@@ -27,6 +35,7 @@ endif
 config LIBFFI
        bool "libffi - A Portable Foreign Function Interface Library"
        default n
+       select LIBPTHREAD_EMBEDDED
 if LIBFFI
 endif
 
diff --git a/Makefile.uk b/Makefile.uk
index 9245448..9bca8fa 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -131,11 +131,10 @@ LIBGO_ASINCLUDES-y = $(LIBGO_COMMON_INCLUDES-y)
 LIBGO_CINCLUDES-y  = $(LIBGO_COMMON_INCLUDES-y)
 
 LIBGO_CFLAGS-y += -DHAVE_CONFIG_H -D_INCLUDE_MALLOC_H_ \
-       -fexceptions -fnon-call-exceptions -fplan9-extensions -fsplit-stack \
+       -fexceptions -fnon-call-exceptions -fplan9-extensions -fno-split-stack \
        -Wall -Wextra -Wwrite-strings -Wcast-qual -Wno-unused-function \
        -minline-all-stringops \
-       -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-       -fno-split-stack
+       -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 LIBGO_CFLAGS-y += -Wno-cast-qual -Wno-unused-value
 
 LIBGO_SRCS-y += $(LIBGO_EXTRACTED)/go/bytes/indexbyte.c|bytes
@@ -202,7 +201,7 @@ LIBGO_SRCS-y += $(LIBGO_EXTRACTED)/sysinfo.c
 LIBGO_SRCS-y += $(LIBGO_EXTRACTED)/malloc.c # generated
 
 # Generate go2c tool
-$(LIBGO_BUILD)/goc2c: $(LIBGCC_BUILD)/.origin
+$(LIBGO_BUILD)/goc2c: $(LIBGCC_BUILD)/.patched
        $(call verbose_cmd,GEN,libgo: $(notdir $@), \
                cd $(LIBGO_EXTRACTED) && gcc -o $@ 
$(LIBGO_EXTRACTED)/runtime/goc2c.c)
 
@@ -224,3 +223,4 @@ LIBGO_GOFLAGS = $(LIBGO_GOFLAGS-y)
 
 include $(LIBGCC_BASE)/libgo/packages.uk
 
+LIBGO_EXPORTS = $(LIBGCC_BASE)/libgo/exportsyms.uk
-- 
2.17.1


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