diff mbox series

[gdb/build] Fix build on postmarketos

Message ID 20240314095440.23256-1-tdevries@suse.de
State Superseded
Headers
Series [gdb/build] Fix build on postmarketos |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed

Commit Message

Tom de Vries March 14, 2024, 9:54 a.m. UTC 
  I tried building gdbserver on postmarketos (which is based on alpine linux,
which uses musl libc), and ran into:
...
gdbserver/linux-low.cc: In lambda function:
gdbserver/linux-low.cc:1907:41: error: \
  'W_EXITCODE' was not declared in this scope
 1907 |               mark_lwp_dead (leader_lp, W_EXITCODE (0, 0), true);
      |                                         ^~~~~~~~~~
...

The macro W_EXITCODE is not defined in gdbsupport/gdb_wait.h, but WSETEXIT is:
...
 /* These are not defined in POSIX, but are used by our programs.  */

 #ifndef WSETEXIT
 # ifdef W_EXITCODE
 #define WSETEXIT(w,status) ((w) = W_EXITCODE(status,0))
 # else
 #define WSETEXIT(w,status) ((w) = (0 | ((status) << 8)))
 # endif
 #endif
...

Fix this by using WSETEXIT.

Tested on x86_64-linux.

PR build/31483
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31483
---
 gdbserver/linux-low.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


base-commit: 3a4c6f1aa958739705ee69526fdeed7c69d7243c

Comments

Tom Tromey March 14, 2024, 12:43 p.m. UTC | #1 
>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:

Tom> I tried building gdbserver on postmarketos (which is based on alpine linux,
Tom> which uses musl libc), and ran into:
Tom> ...
Tom> gdbserver/linux-low.cc: In lambda function:
Tom> gdbserver/linux-low.cc:1907:41: error: \
Tom>   'W_EXITCODE' was not declared in this scope
Tom>  1907 |               mark_lwp_dead (leader_lp, W_EXITCODE (0, 0), true);
Tom>       |                                         ^~~~~~~~~~
Tom> ...

Tom> The macro W_EXITCODE is not defined in gdbsupport/gdb_wait.h, but WSETEXIT is:
Tom> ...
Tom>  /* These are not defined in POSIX, but are used by our programs.  */

Tom>  #ifndef WSETEXIT
Tom>  # ifdef W_EXITCODE
Tom>  #define WSETEXIT(w,status) ((w) = W_EXITCODE(status,0))
Tom>  # else
Tom>  #define WSETEXIT(w,status) ((w) = (0 | ((status) << 8)))
Tom>  # endif
Tom>  #endif
Tom> ...

I think it'd be better to change this to define W_EXITCODE.
WSETEXIT isn't used in the tree at all AFAICT.

Tom
Tom de Vries March 14, 2024, 4:32 p.m. UTC | #2 
On 3/14/24 13:43, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
> 
> Tom> I tried building gdbserver on postmarketos (which is based on alpine linux,
> Tom> which uses musl libc), and ran into:
> Tom> ...
> Tom> gdbserver/linux-low.cc: In lambda function:
> Tom> gdbserver/linux-low.cc:1907:41: error: \
> Tom>   'W_EXITCODE' was not declared in this scope
> Tom>  1907 |               mark_lwp_dead (leader_lp, W_EXITCODE (0, 0), true);
> Tom>       |                                         ^~~~~~~~~~
> Tom> ...
> 
> Tom> The macro W_EXITCODE is not defined in gdbsupport/gdb_wait.h, but WSETEXIT is:
> Tom> ...
> Tom>  /* These are not defined in POSIX, but are used by our programs.  */
> 
> Tom>  #ifndef WSETEXIT
> Tom>  # ifdef W_EXITCODE
> Tom>  #define WSETEXIT(w,status) ((w) = W_EXITCODE(status,0))
> Tom>  # else
> Tom>  #define WSETEXIT(w,status) ((w) = (0 | ((status) << 8)))
> Tom>  # endif
> Tom>  #endif
> Tom> ...
> 
> I think it'd be better to change this to define W_EXITCODE.
> WSETEXIT isn't used in the tree at all AFAICT.

Thanks for the review.

Fine by me, I've submitted a v2 here ( 
https://sourceware.org/pipermail/gdb-patches/2024-March/207288.html ).

Thanks,
- Tom
diff mbox series

Patch

diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 9d5a6242803..aaa7bbc2a4c 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -1904,7 +1904,9 @@  linux_process_target::check_zombie_leaders ()
 	  thread_info *leader_thread = get_lwp_thread (leader_lp);
 	  if (report_exit_events_for (leader_thread))
 	    {
-	      mark_lwp_dead (leader_lp, W_EXITCODE (0, 0), true);
+	      int wstat;
+	      WSETEXIT (wstat, 0);
+	      mark_lwp_dead (leader_lp, wstat, true);
 	      new_pending_event = true;
 	    }
 	  else