diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-08-08 13:06:49 +0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-08-13 12:47:11 -0700 |
| commit | 474a2d9f5f8a080e30812525729c3a8b7baa61d6 (patch) | |
| tree | f8b14eabb88d2bccdc21b5d4afb10846f679c836 /sim/bfin/sim-main.h | |
| parent | 752cf9131f9e0fc39f9be5c1933d2f4d5b0b5ac9 (diff) | |
| download | gdb-474a2d9f5f8a080e30812525729c3a8b7baa61d6.zip gdb-474a2d9f5f8a080e30812525729c3a8b7baa61d6.tar.gz gdb-474a2d9f5f8a080e30812525729c3a8b7baa61d6.tar.bz2 | |
sim: bfin: split out common mach/model defines into arch.h [PR sim/20438]
The current machs.h mixes common enums with Blackfin-specific defines.
This causes us troubles with header inclusion order such that we can't
drop the old SIM_CPU typedef (which is duplicated in common code). By
splitting the two up, we can unwind this dependency chain, and drop the
old typedef. It also fixes building with older gcc versions.
Diffstat (limited to 'sim/bfin/sim-main.h')
| -rw-r--r-- | sim/bfin/sim-main.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h index 51fb87e..34fd153 100644 --- a/sim/bfin/sim-main.h +++ b/sim/bfin/sim-main.h @@ -23,17 +23,13 @@ #include "sim-basics.h" #include "sim-signal.h" - -/* TODO: Delete this. Need to convert bu32/etc... to common sim types - and unwind the bfin-sim.h/machs.h include below first though. */ -typedef struct _sim_cpu SIM_CPU; +#include "arch.h" +#include "sim-base.h" #include "bfin-sim.h" #include "machs.h" -#include "sim-base.h" - struct _sim_cpu { /* ... simulator specific members ... */ struct bfin_cpu_state state; |