From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 24 Jun 2015 14:23:12 +0000 (+0700)
Subject: gdb: sim: merge the sysroot update logic together
X-Git-Tag: gdb-7.10-branchpoint~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87d1b30944783ae0efb49236c6d872d775a37417;p=thirdparty%2Fbinutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f46a620728a..19144edf348 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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.
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 0c43379001d..82c129db9c0 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -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)