Re: [Minios-devel] [UNIKRAFT/LIBGO PATCH 04/11] Add patches to build the library

[Felipe Huici <Felipe.Huici@xxxxxxxxx>]

Thanks again. 

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

On 26.09.19, 17:32, "Charalampos Mainas" <Charalampos.Mainas@xxxxxxxxx> wrote:

    From: Costin Lupu <costin.lupu@xxxxxxxxx>
    
    libgo expects a unwind.h header although it comes with its own header,
    unwind-generic.h, so we will be using that one instead.
    
    The second patch should be also upstreamed since it seems to remove an
    unnecessary include directive.
    
    Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    ---
     ...-unwind-header-instead-of-system-one.patch | 25 +++++++++++++++++++
     patches/0002-libgo-No-futex-tonight.patch     | 25 +++++++++++++++++++
     2 files changed, 50 insertions(+)
     create mode 100644 
patches/0001-libgo-Use-gcc-own-unwind-header-instead-of-system-one.patch
     create mode 100644 patches/0002-libgo-No-futex-tonight.patch
    
    diff --git 
a/patches/0001-libgo-Use-gcc-own-unwind-header-instead-of-system-one.patch 
b/patches/0001-libgo-Use-gcc-own-unwind-header-instead-of-system-one.patch
    new file mode 100644
    index 0000000..7ec09bc
    --- /dev/null
    +++ 
b/patches/0001-libgo-Use-gcc-own-unwind-header-instead-of-system-one.patch
    @@ -0,0 +1,25 @@
    +From 596b3b33e72c5c64cb7ead4aee2983869008ad44 Mon Sep 17 00:00:00 2001
    +Date: Fri, 16 Aug 2019 23:13:03 +0200
    +Subject: [PATCH 1/2] libgo: Use gcc own unwind header instead of system one
    +
    +Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    +---
    + libgo/runtime/go-unwind.c | 2 +-
    + 1 file changed, 1 insertion(+), 1 deletion(-)
    +
    +diff --git a/libgo/runtime/go-unwind.c b/libgo/runtime/go-unwind.c
    +index 4c9fb49c9..907ba0336 100644
    +--- a/libgo/runtime/go-unwind.c
    ++++ b/libgo/runtime/go-unwind.c
    +@@ -9,7 +9,7 @@
    + #include <stdlib.h>
    + #include <unistd.h>
    + 
    +-#include "unwind.h"
    ++#include "unwind-generic.h"
    + #define NO_SIZE_OF_ENCODED_VALUE
    + #include "unwind-pe.h"
    + 
    +-- 
    +2.20.1
    +
    diff --git a/patches/0002-libgo-No-futex-tonight.patch 
b/patches/0002-libgo-No-futex-tonight.patch
    new file mode 100644
    index 0000000..7892e47
    --- /dev/null
    +++ b/patches/0002-libgo-No-futex-tonight.patch
    @@ -0,0 +1,25 @@
    +From 5ea9d76060b0347002468159fc50b8f81bc726b1 Mon Sep 17 00:00:00 2001
    +From: Costin Lupu <costin.lup@xxxxxxxxx>
    +Date: Fri, 16 Aug 2019 23:14:34 +0200
    +Subject: [PATCH 2/2] libgo: No futex tonight
    +
    +Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    +---
    + libgo/runtime/thread-linux.c | 1 -
    + 1 file changed, 1 deletion(-)
    +
    +diff --git a/libgo/runtime/thread-linux.c b/libgo/runtime/thread-linux.c
    +index 81ad0f9c9..fd5a31182 100644
    +--- a/libgo/runtime/thread-linux.c
    ++++ b/libgo/runtime/thread-linux.c
    +@@ -9,7 +9,6 @@
    + 
    + #include <unistd.h>
    + #include <syscall.h>
    +-#include <linux/futex.h>
    + 
    + void
    + runtime_osinit(void)
    +-- 
    +2.20.1
    +
    -- 
    2.17.1
    
    

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