Re: Small patch to enable build of gdb-7.6 for GNU/Hurd

Svante Signell
2013-05-27T13:48:25Z

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

On Mon, 2013-05-27 at 14:21 +0200, Svante Signell wrote:
> On Mon, 2013-05-27 at 16:10 +0400, Joel Brobecker wrote:
> > > 2013-05-27 Svante Signell <srs@hurd-2013.my.own.domain>
> > >
> > > * nto-tdep.c (nto_init_solib_absolute_prefix): Solve build
> > > problems for systems not defining PATH_MAX by using xstrprintf and
> > > a cleanup.
> >
> > Is the domain name above really valid?
>
> No, it's a local one. I forgot to change that one.

Attaching an ChangeLog entry with a correct domain

> > While looking at this code, I don't think you'll need 2 xstrprintf
> > either. Can you try the attached patch?
>
> Yes, of course this code is much neater. I will report build status
> soon.

I had to change the second make_cleanup call to do_cleanups instead, see
the updated patch. OK now?

[-- Attachment #2: ChangeLog.solve_PATH_MAX_issue --]
[-- Type: text/plain, Size: 206 bytes --]

2013-05-27 Svante Signell <svante.signell@gmail.com>

* nto-tdep.c (nto_init_solib_absolute_prefix): Solve build
problems for systems not defining PATH_MAX by using xstrprintf
followed by a cleanup.

[-- Attachment #3: nto-tdep.diff --]
[-- Type: text/x-patch, Size: 996 bytes --]

diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 748869f..cf4fd60 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -147,9 +147,10 @@ nto_find_and_open_solib (char *solib, unsigned o_flags, char **temp_pathname)
void
nto_init_solib_absolute_prefix (void)
{
- char buf[PATH_MAX * 2], arch_path[PATH_MAX];
+ char buf;
char *nto_root, *endian;
const char *arch;
+ struct cleanup *old_chain;

nto_root = nto_target ();
if (strcmp (gdbarch_bfd_arch_info (target_gdbarch ())->arch_name, "i386") == 0)
@@ -172,10 +173,11 @@ nto_init_solib_absolute_prefix (void)
== BFD_ENDIAN_BIG ? "be" : "le";
}

- xsnprintf (arch_path, sizeof (arch_path), "%s/%s%s", nto_root, arch, endian);
-
- xsnprintf (buf, sizeof (buf), "set solib-absolute-prefix %s", arch_path);
+ buf = xstrprintf ("set solib-absolute-prefix \"%s/%s%s\"",
+ nto_root, arch, endian);
+ old_chain = make_cleanup (xfree, buf);
execute_command (buf, 0);
+ do_cleanups (old_chain);
}

char **