diff options
| author | Doug Evans <dje@google.com> | 2015-10-26 13:24:01 -0700 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2015-10-26 13:24:01 -0700 |
| commit | 963843d4d07aef6caa296dacf191f8adc9518596 (patch) | |
| tree | 8e5fa9f2284230b01a914a09a9f8abe78e9a76d2 | |
| parent | d41401ace01c234f42697e190a2ac95991780626 (diff) | |
| download | gdb-963843d4d07aef6caa296dacf191f8adc9518596.zip gdb-963843d4d07aef6caa296dacf191f8adc9518596.tar.gz gdb-963843d4d07aef6caa296dacf191f8adc9518596.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/common/gdb_wait.h | 8 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 79c8e8e..9806a42 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 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. (thread_db_pid_to_str): Ditto. diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h index 9b250d2..412f813 100644 --- 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 4bcd7a5..99973bf 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,9 @@ 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 for debug_printf. (attach_thread, find_new_threads_callback): Ditto. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 0c552b8..7ed67c7 100644 --- 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 |