From 1554f758410c4307103120424d35050e88433d85 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 5 Feb 2016 20:16:41 -0500 Subject: [PATCH] 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. --- sim/mips/ChangeLog | 6 ++++++ sim/mips/configure | 2 +- sim/mips/configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 0370e2b32e..20ba0ff131 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,9 @@ +2016-02-05 Mike Frysinger + + * configure.ac (sim_engine_run): Change sd->base.prog_bfd to + STATE_PROG_BFD (sd). + * configure: Regenerate. + 2016-01-18 Andrew Bennett Maciej W. Rozycki diff --git a/sim/mips/configure b/sim/mips/configure index 1e61e9da36..94e75a5d46 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 476fc3562f..823a00ce4f 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 -- 2.34.1