diff mbox

libgo patch committed: Fix ptrace implementation on MIPS

Message ID m2podtvpba.fsf@linux-m68k.org
State New
Headers show

Commit Message

Andreas Schwab June 24, 2017, 7:04 a.m. UTC 
On Jun 23 2017, Ian Lance Taylor <iant@golang.org> wrote:

> Andreas, can we avoid the problem for earlier glibc versions with a
> patch like the appended?
>
> Ian
>
> diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
> index a1afc7d1..80407443 100644
> --- a/libgo/sysinfo.c
> +++ b/libgo/sysinfo.c
> @@ -38,7 +38,10 @@
>  #if defined(HAVE_NETINET_IF_ETHER_H)
>  #include <netinet/if_ether.h>
>  #endif
> +/* Avoid https://sourceware.org/bugzilla/show_bug.cgi?id=762 .  */
> +#define ia64_fpreg pt_ia64_fpreg
>  #include <signal.h>
> +#undef ia64_fpreg

That doesn't work, but this does:


Andreas.

Comments

Ian Lance Taylor June 26, 2017, 5:56 p.m. UTC | #1 
On Sat, Jun 24, 2017 at 12:04 AM, Andreas Schwab <schwab@suse.de> wrote:
> On Jun 23 2017, Ian Lance Taylor <iant@golang.org> wrote:
>
>> Andreas, can we avoid the problem for earlier glibc versions with a
>> patch like the appended?
>>
>> Ian
>>
>> diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
>> index a1afc7d1..80407443 100644
>> --- a/libgo/sysinfo.c
>> +++ b/libgo/sysinfo.c
>> @@ -38,7 +38,10 @@
>>  #if defined(HAVE_NETINET_IF_ETHER_H)
>>  #include <netinet/if_ether.h>
>>  #endif
>> +/* Avoid https://sourceware.org/bugzilla/show_bug.cgi?id=762 .  */
>> +#define ia64_fpreg pt_ia64_fpreg
>>  #include <signal.h>
>> +#undef ia64_fpreg
>
> That doesn't work, but this does:
>
> 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>


Thanks.

Committed to mainline.

Ian
diff mbox

Patch

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>