* config/nm-linux.h (struct target_ops): Remove forward declaration.

	(lin_thread_get_thread_signals): Remove prototype.
	(GET_THREAD_SIGNALS): Remove.
	* linux-nat.h (lin_thread_get_thread_signals): Add prototype.
	* linux-thread-db.c (check_thread_signals): Directly call
	lin_thread_get_thread_signals; do not check GET_THREAD_SIGNALS.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9f7ac39755c2884a9faba6223e06521e467650c3..cbac1f518308a1884caaf9b7fb1627787c4daec6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-09  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * config/nm-linux.h (struct target_ops): Remove forward declaration.
+       (lin_thread_get_thread_signals): Remove prototype.
+       (GET_THREAD_SIGNALS): Remove.
+       * linux-nat.h (lin_thread_get_thread_signals): Add prototype.
+       * linux-thread-db.c (check_thread_signals): Directly call
+       lin_thread_get_thread_signals; do not check GET_THREAD_SIGNALS.
+
 2010-06-09  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * gregset.h (GDB_FPXREGSET_T): Remove.

diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h
index ba2a56ffc0d519b4fbb11a3388f4f3f9b36abd8d..2e3d85169bad391ac38783e483f5877755896e41 100644 (file)
--- a/gdb/config/nm-linux.h
+++ b/gdb/config/nm-linux.h
@@ -18,11 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-struct target_ops;
-
-extern void lin_thread_get_thread_signals (sigset_t *mask);
-#define GET_THREAD_SIGNALS(mask) lin_thread_get_thread_signals (mask)
-
 /* Use elf_gregset_t and elf_fpregset_t, rather than
    gregset_t and fpregset_t.  */
 

diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
index 5aba089eaf3d20a703b0f7db9ed8607a0b3d375e..2858f08f545a20bada40bd3997f4c18409350732 100644 (file)
--- a/gdb/linux-nat.h
+++ b/gdb/linux-nat.h
@@ -118,6 +118,9 @@ void check_for_thread_db (void);
 
 int thread_db_attach_lwp (ptid_t ptid);
 
+/* Return the set of signals used by the threads library.  */
+extern void lin_thread_get_thread_signals (sigset_t *mask);
+
 /* Find process PID's pending signal set from /proc/pid/status.  */
 void linux_proc_pending_signals (int pid, sigset_t *pending, sigset_t *blocked, sigset_t *ignored);
 

diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 2b1fb70ebdad8dcc34a6f043486dc92784b47404..6cbf6c3d396da46c70d92abde2e80e93a281dcca 100644 (file)
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -928,13 +928,12 @@ disable_thread_event_reporting (struct thread_db_info *info)
 static void
 check_thread_signals (void)
 {
-#ifdef GET_THREAD_SIGNALS
   if (!thread_signals)
     {
       sigset_t mask;
       int i;
 
-      GET_THREAD_SIGNALS (&mask);
+      lin_thread_get_thread_signals (&mask);
       sigemptyset (&thread_stop_set);
       sigemptyset (&thread_print_set);
 
@@ -950,7 +949,6 @@ check_thread_signals (void)
            }
        }
     }
-#endif
 }
 
 /* Check whether thread_db is usable.  This function is called when