sim: mips: fix prog_bfd usage

We do not want to reference the "base" member directly.  We have the
STATE_PROG_BFD macro instead to look up the prog_bfd member.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 0370e2b..20ba0ff 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-05  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac (sim_engine_run): Change sd->base.prog_bfd to
+       STATE_PROG_BFD (sd).
+       * configure: Regenerate.
+

 2016-01-18  Andrew Bennett  <andrew.bennett@imgtec.com>
            Maciej W. Rozycki  <macro@imgtec.com>
 
 2016-01-18  Andrew Bennett  <andrew.bennett@imgtec.com>
            Maciej W. Rozycki  <macro@imgtec.com>
 

diff --git a/sim/mips/configure b/sim/mips/configure
index 1e61e9d..94e75a5 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -14063,7 +14063,7 @@ sim_engine_run (SIM_DESC sd,
 
   if (STATE_ARCHITECTURE (sd) == NULL)
     mach = bfd_mach_${sim_multi_default};
 
   if (STATE_ARCHITECTURE (sd) == NULL)
     mach = bfd_mach_${sim_multi_default};

-  else if (elf_elfheader (sd->base.prog_bfd)->e_flags
+  else if (elf_elfheader (STATE_PROG_BFD (sd))->e_flags

           & EF_MIPS_ARCH_ASE_MICROMIPS)
     mach = bfd_mach_mips_micromips;
   else
           & EF_MIPS_ARCH_ASE_MICROMIPS)
     mach = bfd_mach_mips_micromips;
   else

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 476fc35..823a00c 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -259,7 +259,7 @@ sim_engine_run (SIM_DESC sd,
 
   if (STATE_ARCHITECTURE (sd) == NULL)
     mach = bfd_mach_${sim_multi_default};
 
   if (STATE_ARCHITECTURE (sd) == NULL)
     mach = bfd_mach_${sim_multi_default};

-  else if (elf_elfheader (sd->base.prog_bfd)->e_flags
+  else if (elf_elfheader (STATE_PROG_BFD (sd))->e_flags

           & EF_MIPS_ARCH_ASE_MICROMIPS)
     mach = bfd_mach_mips_micromips;
   else
           & EF_MIPS_ARCH_ASE_MICROMIPS)
     mach = bfd_mach_mips_micromips;
   else