diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-11-06 20:40:20 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-11-06 20:40:20 -0400 |
| commit | fd0975b96b16d96010dce439af9620d3dfb65426 (patch) | |
| tree | 531211675eb93b447ea75c3c284547d0442b0994 /sim | |
| parent | b44c5d6e216cb085023d14005f08258be562ba90 (diff) | |
| download | gdb-fd0975b96b16d96010dce439af9620d3dfb65426.zip gdb-fd0975b96b16d96010dce439af9620d3dfb65426.tar.gz gdb-fd0975b96b16d96010dce439af9620d3dfb65426.tar.bz2 | |
sim: arm/bfin/rx: undefine page size from system headers
Some targets (like cygwin) will export page size defines that clash
with our local usage here. Undefine the system one to fix building
for these targets.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/arm/armvirt.c | 1 | ||||
| -rw-r--r-- | sim/bfin/dv-bfin_mmu.h | 2 | ||||
| -rw-r--r-- | sim/rx/mem.h | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/sim/arm/armvirt.c b/sim/arm/armvirt.c index ba01a65..c162ba7 100644 --- a/sim/arm/armvirt.c +++ b/sim/arm/armvirt.c @@ -46,6 +46,7 @@ #endif +#undef PAGESIZE /* Cleanup system headers. */ #define NUMPAGES 64 * 1024 #define PAGESIZE 64 * 1024 #define PAGEBITS 16 diff --git a/sim/bfin/dv-bfin_mmu.h b/sim/bfin/dv-bfin_mmu.h index 2405f28..408b392 100644 --- a/sim/bfin/dv-bfin_mmu.h +++ b/sim/bfin/dv-bfin_mmu.h @@ -21,6 +21,8 @@ #ifndef DV_BFIN_MMU_H #define DV_BFIN_MMU_H +#undef PAGE_SIZE /* Cleanup system headers. */ + void mmu_check_addr (SIM_CPU *, bu32 addr, bool write, bool inst, int size); void mmu_check_cache_addr (SIM_CPU *, bu32 addr, bool write, bool inst); void mmu_process_fault (SIM_CPU *, bu32 addr, bool write, bool inst, bool unaligned, bool miss); diff --git a/sim/rx/mem.h b/sim/rx/mem.h index a4c7455..15bb557 100644 --- a/sim/rx/mem.h +++ b/sim/rx/mem.h @@ -37,6 +37,8 @@ void init_mem (void); void mem_usage_stats (void); unsigned long mem_usage_cycles (void); +#undef PAGE_SIZE /* Cleanup system headers. */ + /* rx_mem_ptr returns a pointer which is valid as long as the address requested remains within the same page. */ #define PAGE_BITS 12 |