aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/syscall/clone_linux.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b5ba744..a6ea428 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-7e4543d050339e113e6278fd442d940c0f1a5670
+c18d9f0e7270144ebd1f67d85995f434bbdab0b0
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/syscall/clone_linux.c b/libgo/go/syscall/clone_linux.c
index a1a15ea..b7eed6c 100644
--- a/libgo/go/syscall/clone_linux.c
+++ b/libgo/go/syscall/clone_linux.c
@@ -10,7 +10,10 @@
#include "runtime.h"
-long rawClone (unsigned long flags, void *child_stack, void *ptid, void *ctid, struct pt_regs *regs) __asm__ (GOSYM_PREFIX "syscall.rawClone");
+long rawClone (unsigned long flags, void *child_stack, void *ptid,
+ void *ctid, struct pt_regs *regs)
+ __asm__ (GOSYM_PREFIX "syscall.rawClone")
+ __attribute__ ((no_split_stack));
long
rawClone (unsigned long flags, void *child_stack, void *ptid, void *ctid, struct pt_regs *regs)