On 11/22/21 9:38 AM, Jan Palus wrote:
> On 22.11.2021 07:46, Tom de Vries wrote:
>> On 11/21/21 8:45 PM, Jan Palus wrote:
>>> gdb 11.1 fails during compilation on x32 ABI:
>>>
>>> ../.././gdbserver/../gdb/nat/amd64-linux-siginfo.c:280:42: error: 'struct compat_x32_siginfo_t::<unnamed union>::<unnamed>' has no member named 'si_addr_bnd'
>>> 280 | #define cpt_si_lower _sifields._sigfault.si_addr_bnd._lower
>>> | ^~~~~~~~~~~
>>> ../.././gdbserver/../gdb/nat/amd64-linux-siginfo.c:337:38: note: in expansion of macro 'cpt_si_lower'
>>> 337 | to->cpt_si_lower = from_ptrace.cpt_si_lower;
>>> | ^~~~~~~~~~~~
>>> ../.././gdbserver/../gdb/nat/amd64-linux-siginfo.c:281:42: error: 'struct compat_x32_siginfo_t::<unnamed union>::<unnamed>' has no member named 'si_addr_bnd'
>>> 281 | #define cpt_si_upper _sifields._sigfault.si_addr_bnd._upper
>>> | ^~~~~~~~~~~
>>> ../.././gdbserver/../gdb/nat/amd64-linux-siginfo.c:338:38: note: in expansion of macro 'cpt_si_upper'
>>> 338 | to->cpt_si_upper = from_ptrace.cpt_si_upper;
>>> | ^~~~~~~~~~~~
>>>
>>> I believe it is caused by https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d3d7d1b
>>
>> Hi,
>>
>> I've attached a conservative fix, can you check whether that fixes the
>> build breaker?
> 
> Thanks. That's essentially the same fix as the temporary workaround I
> came up with:
> 
> http://git.pld-linux.org/?p=packages/gdb.git;a=commitdiff;h=9f79cb7
> 
> and can confirm that it fixes the failure and build is successful on x32.

Committed as attached below.

Thanks,
- Tom