diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-26 17:56:14 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-26 17:56:14 +0000 |
| commit | 3e8d2bb2eccdc1687608594bae06debe7f83fee3 (patch) | |
| tree | 590c9fed9adf24168a9f9a789c99ede20acaf9e0 | |
| parent | c704233186ab42f9bb9bae56a3ad36a5096a2854 (diff) | |
| download | gcc-3e8d2bb2eccdc1687608594bae06debe7f83fee3.tar.gz | |
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
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249662 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/sysinfo.c | 5 |
2 files changed, 6 insertions, 1 deletions
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> |