From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 26 Jun 2017 17:56:14 +0000 (+0000)
Subject: libgo: redefine ia64 struct names around linux/ptrace.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bcce674a7c00268afb2ee3ddc84a1a2fa1ea870;p=gcc.git

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
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 416a5876da8..72d12b46ebc 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.
diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
index a1afc7d119c..1ba27b1a093 100644
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
@@ -103,7 +103,12 @@
 #include <linux/netlink.h>
 #endif
 #if defined(HAVE_LINUX_PTRACE_H)
+/* Avoid https://sourceware.org/bugzilla/show_bug.cgi?id=762 .  */
+#define ia64_fpreg pt_ia64_fpreg
+#define pt_all_user_regs pt_ia64_all_user_regs
 #include <linux/ptrace.h>
+#undef ia64_fpreg
+#undef pt_all_user_regs
 #endif
 #if defined(HAVE_LINUX_RTNETLINK_H)
 #include <linux/rtnetlink.h>