Index: gdb.git/gdb/procfs.c =================================================================== --- gdb.git.orig/gdb/procfs.c +++ gdb.git/gdb/procfs.c @@ -1569,6 +1569,12 @@ proc_set_watchpoint (procinfo *pi, CORE_ #include +// These macros are not exposed by default on Dyson to avoid conflicts +// with other software (due to very generic names). +#ifndef GS +#define GS 0 +#endif + /* The KEY is actually the value of the lower 16 bits of the GS register for the LWP that we're interested in. Returns the matching ssh struct (LDT entry). */ @@ -1641,6 +1647,7 @@ procfs_find_LDT_entry (ptid_t ptid) /* A /* Find the matching entry and return it. */ return proc_get_LDT_entry (pi, key); } +#undef GS #endif