diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/syscall/clone_linux.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 9c1ed01..08a86e9 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f38ba8837a0c961e18d982930e192132870f3836 +6c9070324d5b7c8483bc7c17b0a8faaa1fb1ae30 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 b7eed6c..30753e6 100644 --- a/libgo/go/syscall/clone_linux.c +++ b/libgo/go/syscall/clone_linux.c @@ -5,18 +5,17 @@ license that can be found in the LICENSE file. */ #include <errno.h> -#include <asm/ptrace.h> #include <sys/syscall.h> #include "runtime.h" long rawClone (unsigned long flags, void *child_stack, void *ptid, - void *ctid, struct pt_regs *regs) + void *ctid, void *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) +rawClone (unsigned long flags, void *child_stack, void *ptid, void *ctid, void *regs) { #if defined(__arc__) || defined(__aarch64__) || defined(__arm__) || defined(__mips__) || defined(__hppa__) || defined(__powerpc__) || defined(__score__) || defined(__i386__) || defined(__xtensa__) // CLONE_BACKWARDS |