---- gdb-8.0/gdb/gdbserver/linux-amd64-ipa.c~ 2017-06-04 17:51:26.000000000 +0200
-+++ gdb-8.0/gdb/gdbserver/linux-amd64-ipa.c 2017-06-07 01:14:20.673962263 +0200
-@@ -182,8 +182,8 @@
- return tdesc_x32_linux;
- case X86_TDESC_AVX:
- return tdesc_x32_avx_linux;
-- case X86_TDESC_AVX512:
-- return tdesc_x32_avx512_linux;
-+ case X86_TDESC_AVX_AVX512:
-+ return tdesc_x32_avx_avx512_linux;
- default:
- break;
+--- gdb-11.1/gdb/nat/amd64-linux-siginfo.c.orig 2021-07-03 19:41:10.000000000 +0200
++++ gdb-11.1/gdb/nat/amd64-linux-siginfo.c 2021-11-21 18:32:29.634785279 +0100
+@@ -330,6 +330,7 @@
+ to->cpt_si_pid = from_ptrace.cpt_si_pid;
+ to->cpt_si_uid = from_ptrace.cpt_si_uid;
}
-@@ -279,7 +279,7 @@
- #if defined __ILP32__
- init_registers_x32_linux ();
- init_registers_x32_avx_linux ();
-- init_registers_x32_avx512_linux ();
-+ init_registers_x32_avx_avx512_linux ();
- #else
- init_registers_amd64_linux ();
- init_registers_amd64_avx_linux ();
++#ifndef __ILP32__
+ else if (to->si_code == SEGV_BNDERR
+ && to->si_signo == SIGSEGV)
+ {
+@@ -337,6 +338,7 @@
+ to->cpt_si_lower = from_ptrace.cpt_si_lower;
+ to->cpt_si_upper = from_ptrace.cpt_si_upper;
+ }
++#endif
+ else if (to->si_code < 0)
+ {
+ to->cpt_si_pid = from_ptrace.cpt_si_pid;