aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-26 17:56:14 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-26 17:56:14 +0000
commit0bcce674a7c00268afb2ee3ddc84a1a2fa1ea870 (patch)
tree590c9fed9adf24168a9f9a789c99ede20acaf9e0 /gcc/go
parent4b377e01ce6b56e0ec0276596e47bfbaacf97aa6 (diff)
downloadgcc-0bcce674a7c00268afb2ee3ddc84a1a2fa1ea870.zip
gcc-0bcce674a7c00268afb2ee3ddc84a1a2fa1ea870.tar.gz
gcc-0bcce674a7c00268afb2ee3ddc84a1a2fa1ea870.tar.bz2
libgo: redefine ia64 struct names around linux/ptrace.h
Avoid https://sourceware.org/bugzilla/show_bug.cgi?id=762. Patch by Andreas Schwab. Reviewed-on: https://go-review.googlesource.com/46711 From-SVN: r249662
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 416a587..72d12b4 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0a20181d00d43a423c55f4e772b759fba0619478
+1b4c2bcaa96f7f40538fd8fff308ad92ea6f482e
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.