diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-26 17:56:14 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-06-26 17:56:14 +0000 |
| commit | 0bcce674a7c00268afb2ee3ddc84a1a2fa1ea870 (patch) | |
| tree | 590c9fed9adf24168a9f9a789c99ede20acaf9e0 | |
| parent | 4b377e01ce6b56e0ec0276596e47bfbaacf97aa6 (diff) | |
| download | gcc-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
| -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 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. diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c index a1afc7d..1ba27b1 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> |