Index: gdb-8.2/gdb/gdbarch.sh
===================================================================
--- gdb-8.2.orig/gdb/gdbarch.sh
+++ gdb-8.2/gdb/gdbarch.sh
@@ -904,7 +904,7 @@ M;void;record_special_symbol;struct objf
 # Function for the 'catch syscall' feature.
 
 # Get architecture-specific system calls information from registers.
-M;LONGEST;get_syscall_number;thread_info *thread;thread
+M;LONGEST;get_syscall_number;struct thread_info *thread;thread
 
 # The filename of the XML syscall for this architecture.
 v;const char *;xml_syscall_file;;;0;0;;0;pstring (gdbarch->xml_syscall_file)