musl: Move W_STOPCODE to common/gdb_wait.h.

gdb/ChangeLog:

	* common/gdb_wait.h (W_STOPCODE): Define, moved here from
	gdbserver/linux-low.c.
	(WSETSTOP): Simplify.

gdb/gdbserver/ChangeLog:

	* linux-low.c (W_STOPCODE): Moved to common/gdb_wait.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79c8e8ee22fc3d516fa39ae475ed0b73f77c5223..9806a42d6e72a89a0eee47edc78c632468919c9a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-26  Doug Evans  <dje@google.com>
+
+       * common/gdb_wait.h (W_STOPCODE): Define, moved here from
+       gdbserver/linux-low.c.
+       (WSETSTOP): Simplify.
+
 2015-10-26  Doug Evans  <dje@google.com>
 
        * linux-thread-db.c (find_new_threads_callback): Ditto.

diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h
index 9b250d250ae26e5cedc2ce7ec7d21e666a78f60b..412f8131212f07ff364ce30c50a78e35108884e2 100644 (file)
--- a/gdb/common/gdb_wait.h
+++ b/gdb/common/gdb_wait.h
@@ -85,12 +85,12 @@
 # endif
 #endif
 
+#ifndef W_STOPCODE
+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
+#endif
+
 #ifndef        WSETSTOP
-# ifdef        W_STOPCODE
 #define        WSETSTOP(w,sig)    ((w) = W_STOPCODE(sig))
-# else
-#define WSETSTOP(w,sig)           ((w) = (0177 | ((sig) << 8)))
-# endif
 #endif
 
 /* For native GNU/Linux we may use waitpid and the __WCLONE option.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4bcd7a5748a3f696d6414cb7c35ea16f755e9793..99973bf24db470771c3521447103a82ae4f0a733 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-26  Doug Evans  <dje@google.com>
+
+       * linux-low.c (W_STOPCODE): Moved to common/gdb_wait.h.
+
 2015-10-26  Doug Evans  <dje@google.com>
 
        * thread-db.c (find_one_thread): Cast ti.ti_tid to unsigned long

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 0c552b8f5249e340497f5f8d4ab6e1ce60729a30..7ed67c7dc510ca972237c3cfebe87108931e98e6 100644 (file)
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -70,10 +70,6 @@
 #define O_LARGEFILE 0
 #endif
 
-#ifndef W_STOPCODE
-#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-#endif
-
 /* This is the kernel's hard limit.  Not to be confused with
    SIGRTMIN.  */
 #ifndef __SIGRTMIN