summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-13 04:19:57 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-13 04:19:57 +0000
commitda034eb77a40a4b2cf4f9266f4dd720eeeac4861 (patch)
treed6c8cf29ef312b18ed9521974c8161835c720582
parenta70bfd3e7ace912ecf8a07ab254f5738509a48a4 (diff)
downloadgcc-da034eb77a40a4b2cf4f9266f4dd720eeeac4861.tar.gz
syscall: don't use pt_regs in clone_linux.c
It's unnecessary and it reportedly breaks the build on arm64 GNU/Linux. Reviewed-on: https://go-review.googlesource.com/30978 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241084 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/syscall/clone_linux.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 9c1ed014fc3..08a86e9201c 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 b7eed6c8b20..30753e62690 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