Index: gdb-8.2/gdb/remote.c
===================================================================
--- gdb-8.2.orig/gdb/remote.c
+++ gdb-8.2/gdb/remote.c
@@ -495,7 +495,7 @@ public:
 
   ptid_t get_ada_task_ptid (long lwp, long thread) override;
 
-  thread_info *thread_handle_to_thread_info (const gdb_byte *thread_handle,
+  struct thread_info *thread_handle_to_thread_info (const gdb_byte *thread_handle,
 					     int handle_len,
 					     inferior *inf) override;
 
@@ -758,7 +758,7 @@ public: /* Remote specific methods.  */
 
   void process_initial_stop_replies (int from_tty);
 
-  thread_info *remote_add_thread (ptid_t ptid, bool running, bool executing);
+  struct thread_info *remote_add_thread (ptid_t ptid, bool running, bool executing);
 
   void btrace_sync_conf (const btrace_config *conf);
 
@@ -2379,7 +2379,7 @@ static remote_thread_info *get_remote_th
 /* Add thread PTID to GDB's thread list.  Tag it as executing/running
    according to RUNNING.  */
 
-thread_info *
+struct thread_info *
 remote_target::remote_add_thread (ptid_t ptid, bool running, bool executing)
 {
   struct remote_state *rs = get_remote_state ();
@@ -2421,7 +2421,7 @@ remote_target::remote_notice_new_inferio
   /* If this is a new thread, add it to GDB's thread list.
      If we leave it up to WFI to do this, bad things will happen.  */
 
-  thread_info *tp = find_thread_ptid (currthread);
+  struct thread_info *tp = find_thread_ptid (currthread);
   if (tp != NULL && tp->state == THREAD_EXITED)
     {
       /* We're seeing an event on a thread id we knew had exited.
@@ -2478,7 +2478,7 @@ remote_target::remote_notice_new_inferio
 	}
 
       /* This is really a new thread.  Add it.  */
-      thread_info *new_thr
+      struct thread_info *new_thr
 	= remote_add_thread (currthread, running, executing);
 
       /* If we found a new inferior, let the common code do whatever
@@ -2511,7 +2511,7 @@ get_remote_thread_info (struct thread_in
 static remote_thread_info *
 get_remote_thread_info (ptid_t ptid)
 {
-  thread_info *thr = find_thread_ptid (ptid);
+  struct thread_info *thr = find_thread_ptid (ptid);
   return get_remote_thread_info (thr);
 }
 
@@ -3797,7 +3797,7 @@ remote_target::update_thread_list ()
 
 	      remote_notice_new_inferior (item.ptid, executing);
 
-	      thread_info *tp = find_thread_ptid (item.ptid);
+	      struct thread_info *tp = find_thread_ptid (item.ptid);
 	      remote_thread_info *info = get_remote_thread_info (tp);
 	      info->core = item.core;
 	      info->extra = std::move (item.extra);
@@ -3827,7 +3827,7 @@ remote_target::update_thread_list ()
  */
 
 const char *
-remote_target::extra_thread_info (thread_info *tp)
+remote_target::extra_thread_info (struct thread_info *tp)
 {
   struct remote_state *rs = get_remote_state ();
   int set;
@@ -5872,7 +5872,7 @@ extended_remote_target::attach (const ch
       inferior_ptid = remote_current_thread (inferior_ptid);
 
       /* Add the main thread to the thread list.  */
-      thread_info *thr = add_thread_silent (inferior_ptid);
+      struct thread_info *thr = add_thread_silent (inferior_ptid);
       /* Don't consider the thread stopped until we've processed the
 	 saved stop reply.  */
       set_executing (thr->ptid, true);
@@ -13969,7 +13969,7 @@ remote_target::execution_direction ()
 /* Return pointer to the thread_info struct which corresponds to
    THREAD_HANDLE (having length HANDLE_LEN).  */
 
-thread_info *
+struct thread_info *
 remote_target::thread_handle_to_thread_info (const gdb_byte *thread_handle,
 					     int handle_len,
 					     inferior *inf)