[PATCH 6/8] gdbserver: Update Haiku support for 17.x

Jérôme Duval
2026-03-12T17:30:08Z

---
gdbserver/haiku-low.cc | 6 ++----
gdbserver/haiku-low.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gdbserver/haiku-low.cc b/gdbserver/haiku-low.cc
index b0551b8f..0b819197 100644
--- a/gdbserver/haiku-low.cc
+++ b/gdbserver/haiku-low.cc
@@ -39,7 +39,7 @@ bool debug_haiku_nat = false;

int
haiku_process_target::create_inferior (const char *program,
- const std::vector<char *> &program_args)
+ const std::string &program_args)
{
haiku_nat_debug_printf ("program=%s", program);

@@ -70,15 +70,13 @@ haiku_process_target::create_inferior (const char *program,
perror_with_name (("haiku_nat::continue_process"));
};

- std::string str_program_args = construct_inferior_arguments (program_args);
-
client_state &cs = get_client_state ();
if (cs.disable_randomization)
get_environ ()->set ("DISABLE_ASLR", "1");
else
get_environ ()->unset ("DISABLE_ASLR");

- pid_t pid = fork_inferior (program, str_program_args.c_str (),
+ pid_t pid = fork_inferior (program, program_args.c_str (),
get_environ ()->envp (), haiku_traceme,
haiku_init_trace, nullptr, nullptr, nullptr);

diff --git a/gdbserver/haiku-low.h b/gdbserver/haiku-low.h
index 11673055..3c92b906 100644
--- a/gdbserver/haiku-low.h
+++ b/gdbserver/haiku-low.h
@@ -24,7 +24,7 @@ class haiku_process_target : public process_stratum_target
{
public:
int create_inferior (const char *program,
- const std::vector<char *> &program_args) override;
+ const std::string &program_args) override;

void post_create_inferior () override;

--
2.43.0