OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb: sim: merge the sysroot update logic together 

Initialize the local sysroot fully before we start using it.
This keeps it all a bit simpler.
This commit is contained in:
Mike Frysinger 2015-06-24 21:23:12 +07:00
parent 8371bf0cd9
commit 87d1b30944
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2015-06-24 Mike Frysinger <vapier@gentoo.org>
* remote-sim.c (gdbsim_open): Move sysroot update to the top.
2015-06-24 Mike Frysinger <vapier@gentoo.org>
* remote-sim.c: Include gdb_bfd.h.

8
gdb/remote-sim.c
View File

@ -670,9 +670,13 @@ gdbsim_open (const char *args, int from_tty)
int len;
char *arg_buf;
struct sim_inferior_data *sim_data;
const char *sysroot = gdb_sysroot;
const char *sysroot;
SIM_DESC gdbsim_desc;
sysroot = gdb_sysroot;
if (is_target_filename (sysroot))
sysroot += strlen (TARGET_SYSROOT_PREFIX);
if (remote_debug)
fprintf_unfiltered (gdb_stdlog,
"gdbsim_open: args \"%s\"\n", args ? args : "(null)");
@ -717,8 +721,6 @@ gdbsim_open (const char *args, int from_tty)
}
/* Pass along gdb's concept of the sysroot. */
strcat (arg_buf, " --sysroot=");
if (is_target_filename (sysroot))
sysroot += strlen (TARGET_SYSROOT_PREFIX);
strcat (arg_buf, sysroot);
/* finally, any explicit args */
if (args)