diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-07-18 22:06:31 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-07-18 22:06:31 +0000 |
| commit | eb80664a39e8bb876bfc6b9ef7ad8578e3c76fa4 (patch) | |
| tree | 0df24cb25c6a797d5a85bf2316ab66a1840069da /gcc | |
| parent | 7a795e10c0619e20148b08a90cf0904e954cb37c (diff) | |
| download | gcc-eb80664a39e8bb876bfc6b9ef7ad8578e3c76fa4.zip gcc-eb80664a39e8bb876bfc6b9ef7ad8578e3c76fa4.tar.gz gcc-eb80664a39e8bb876bfc6b9ef7ad8578e3c76fa4.tar.bz2 | |
re PR go/81324 (libgo does not build with glibc 2.18)
PR go/81324
sysinfo.c: ignore ptrace_peeksiginfo_args from <linux/ptrace.h>
With some versions of glibc and GNU/Linux ptrace_pseeksiginfo_args is
defined in both <sys/ptrace.h> and <linux/ptrace.h>. We don't actually
care about the struct, so use a #define to avoid a redefinition error.
This fixes https://gcc.gnu.org/PR81324.
Reviewed-on: https://go-review.googlesource.com/49290
From-SVN: r250324
Diffstat (limited to 'gcc')
| -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 524aca7..06a8731 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2ae6bf76f97f7d4c63a1f0ad0683b9ba62baaf06 +21775ae119830810d9e415a02e85349f4190c68c The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |