Switch the inferior too in switch_to_program_space_and_thread

[deliverable/binutils-gdb.git] / sim / common / sim-module.c

diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index 3d49f57865398e4fc76a1f7f42fb09c9cde305b4..2ea54c1f653cdabb2e5ad1dbd963b28853c4be1b 100644 (file)
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -1,6 +1,6 @@
 /* Module support.
 
-   Copyright 1996-2015 Free Software Foundation, Inc.
+   Copyright 1996-2020 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support.
 
@@ -74,9 +74,7 @@ sim_pre_argv_init (SIM_DESC sd, const char *myname)
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
   SIM_ASSERT (STATE_MODULES (sd) == NULL);
 
-  STATE_MY_NAME (sd) = myname + strlen (myname);
-  while (STATE_MY_NAME (sd) > myname && STATE_MY_NAME (sd)[-1] != '/')
-    --STATE_MY_NAME (sd);
+  STATE_MY_NAME (sd) = lbasename (myname);
 
   /* Set the cpu names to default values.  */
   {