diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-27 21:51:50 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-27 21:51:50 +0000 |
| commit | f9dedc3f21020bcc704fcfb7caa1b04b5dc874e7 (patch) | |
| tree | da6c87b0ac5dfaad613fd8c6571aeb569c6991cd /gcc/go | |
| parent | acea808abbb527518f052dba0abe0adada6e2d52 (diff) | |
| download | gcc-f9dedc3f21020bcc704fcfb7caa1b04b5dc874e7.zip gcc-f9dedc3f21020bcc704fcfb7caa1b04b5dc874e7.tar.gz gcc-f9dedc3f21020bcc704fcfb7caa1b04b5dc874e7.tar.bz2 | |
syscall: ptrace fixes for s390
Fixes required now that we #include <linux/ptrace.h> in sysinfo.c.
Patch by Andreas Krebbel.
Reviewed-on: https://go-review.googlesource.com/46839
From-SVN: r249712
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 583d603..500ab5e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -040dc31406d580e33f82e578a840600fea5004ef +63b766d67098877496a4b79d7f41e731fbe8abc8 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |