summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-02-05 20:16:41 -0500
committerMike Frysinger <vapier@gentoo.org>2016-02-05 20:27:25 -0500
commit1554f758410c4307103120424d35050e88433d85 (patch)
tree2fc28dcd23f29b5743526e726409337fb8ebb330 /sim
parentbd8d853f779692d3d4f8dfb65cf173f7e080f498 (diff)
downloadbinutils-gdb-1554f758410c4307103120424d35050e88433d85.tar.gz
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.
Diffstat (limited to 'sim')
-rw-r--r--sim/mips/ChangeLog6
-rwxr-xr-xsim/mips/configure2
-rw-r--r--sim/mips/configure.ac2
3 files changed, 8 insertions, 2 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 0370e2b32ed..20ba0ff1315 100644
--- 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>
diff --git a/sim/mips/configure b/sim/mips/configure
index 1e61e9da36c..94e75a5d46c 100755
--- 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};
- 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
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 476fc3562f6..823a00ce4f1 100644
--- 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};
- 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