Merge GDB 7.5.1

gdb/xtensa-linux-nat.c

 /* Xtensa GNU/Linux native support.
 
    Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 28 matching lines @@
 #include <sys/ptrace.h>
 
 #include "gregset.h"
 #include "xtensa-tdep.h"
 
 /* Extended register set depends on hardware configs.
    Keeping these definitions separately allows to introduce
    hardware-specific overlays.  */
 #include "xtensa-xtregs.c"
 
-int
+static int
 get_thread_id (ptid_t ptid)
 {
   int tid = TIDGET (ptid);
   if (0 == tid)
     tid = PIDGET (ptid);
   return tid;
 }
 #define GET_THREAD_ID(PTID)     get_thread_id (PTID)
 
 void
@@ skipping 255 matching lines @@
 
   /* Fill in the generic GNU/Linux methods.  */
   t = linux_target ();
 
   /* Add our register access methods.  */
   t->to_fetch_registers = xtensa_linux_fetch_inferior_registers;
   t->to_store_registers = xtensa_linux_store_inferior_registers;
 
   linux_nat_add_target (t);
 }