From f0c1b768b4f42c631547643ec01b020108c0ef8e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 25 Dec 2015 02:34:40 -0500 Subject: [PATCH] sim: move WITH_SCACHE_PBB to sim-main.h This helps us break up tconfig.h more. Any file using this define should be pulling in sim-main.h already, so things should continue working. --- sim/cris/ChangeLog | 5 +++++ sim/cris/sim-main.h | 5 +++++ sim/cris/tconfig.h | 5 ----- sim/frv/ChangeLog | 5 +++++ sim/frv/sim-main.h | 5 +++++ sim/frv/tconfig.h | 5 ----- sim/iq2000/ChangeLog | 5 +++++ sim/iq2000/sim-main.h | 5 +++++ sim/iq2000/tconfig.h | 5 ----- sim/lm32/ChangeLog | 5 +++++ sim/lm32/sim-main.h | 2 ++ sim/lm32/tconfig.h | 24 ------------------------ sim/m32r/ChangeLog | 5 +++++ sim/m32r/sim-main.h | 5 +++++ sim/m32r/tconfig.h | 5 ----- sim/sh64/ChangeLog | 5 +++++ sim/sh64/sim-main.h | 5 +++++ sim/sh64/tconfig.h | 5 ----- 18 files changed, 57 insertions(+), 49 deletions(-) delete mode 100644 sim/lm32/tconfig.h diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index dbc2d099641..416db96a612 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * sim-main.h (WITH_SCACHE_PBB): Move from ... + * tconfig.h (WITH_SCACHE_PBB): ... here. + 2015-12-25 Mike Frysinger * devices.c (device_error): Delete. diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h index 4dc04a2caa6..ac91e67d0ab 100644 --- a/sim/cris/sim-main.h +++ b/sim/cris/sim-main.h @@ -24,6 +24,11 @@ along with this program. If not, see . */ #ifndef SIM_MAIN_H #define SIM_MAIN_H +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. */ +#define WITH_SCACHE_PBB 1 + #include "symcat.h" #include "sim-basics.h" #include "cgen-types.h" diff --git a/sim/cris/tconfig.h b/sim/cris/tconfig.h index 77b000fe61b..05d86233ea0 100644 --- a/sim/cris/tconfig.h +++ b/sim/cris/tconfig.h @@ -29,9 +29,4 @@ along with this program. If not, see . */ #define SIM_HAVE_MODEL -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. */ -#define WITH_SCACHE_PBB 1 - #endif /* CRIS_TCONFIG_H */ diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index c7a601e7160..08c6d98650c 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * sim-main.h (WITH_SCACHE_PBB): Move from ... + * tconfig.h (WITH_SCACHE_PBB): ... here. + 2015-12-25 Mike Frysinger * devices.c (device_error): Delete. diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h index ef14d64c5ec..ed5d4e20d69 100644 --- a/sim/frv/sim-main.h +++ b/sim/frv/sim-main.h @@ -23,6 +23,11 @@ along with this program. If not, see . */ sim-basics.h and cgen-types.h needs config.h. */ #include "config.h" +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. ???? */ +#define WITH_SCACHE_PBB 0 + #include "symcat.h" #include "sim-basics.h" #include "cgen-types.h" diff --git a/sim/frv/tconfig.h b/sim/frv/tconfig.h index 044cfb07121..1abdc611577 100644 --- a/sim/frv/tconfig.h +++ b/sim/frv/tconfig.h @@ -5,8 +5,3 @@ /* ??? Temporary hack until model support unified. */ #define SIM_HAVE_MODEL - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. ???? */ -#define WITH_SCACHE_PBB 0 diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 770a2be1e82..45f31d554b7 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * sim-main.h (WITH_SCACHE_PBB): Move from ... + * tconfig.h (WITH_SCACHE_PBB): ... here. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HANDLES_LMA): Delete. diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h index 992520a0828..810e4f4252d 100644 --- a/sim/iq2000/sim-main.h +++ b/sim/iq2000/sim-main.h @@ -8,6 +8,11 @@ sim-basics.h and cgen-types.h needs config.h. */ #include "config.h" +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. ???? */ +#define WITH_SCACHE_PBB 1 + #include "symcat.h" #include "sim-basics.h" #include "cgen-types.h" diff --git a/sim/iq2000/tconfig.h b/sim/iq2000/tconfig.h index bd5a3aee8e2..cf63d449ac9 100644 --- a/sim/iq2000/tconfig.h +++ b/sim/iq2000/tconfig.h @@ -5,8 +5,3 @@ /* ??? Temporary hack until model support unified. */ #define SIM_HAVE_MODEL - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. ???? */ -#define WITH_SCACHE_PBB 1 diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 93e7d98dcc5..62320b35f19 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * sim-main.h (WITH_SCACHE_PBB): Move from ... + * tconfig.h (WITH_SCACHE_PBB): ... here. Delete file. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HANDLES_LMA): Delete. diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index 4894e8d65b7..13d00cba53d 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -23,6 +23,8 @@ #ifndef SIM_MAIN_H #define SIM_MAIN_H +#define WITH_SCACHE_PBB 1 + #include "symcat.h" #include "sim-basics.h" #include "cgen-types.h" diff --git a/sim/lm32/tconfig.h b/sim/lm32/tconfig.h deleted file mode 100644 index 7db04f9d102..00000000000 --- a/sim/lm32/tconfig.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Lattice Mico32 simulator configuration. - Contributed by Jon Beniston - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#ifndef LM32_TCONFIG_H -#define LM32_TCONFIG_H - -#define WITH_SCACHE_PBB 1 - -#endif /* LM32_TCONFIG_H */ diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 7a33412ce0b..f0007432d33 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * sim-main.h (WITH_SCACHE_PBB): Move from ... + * tconfig.h (WITH_SCACHE_PBB): ... here. + 2015-12-25 Mike Frysinger * devices.c (device_error): Delete. diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h index cd39e98c021..5b24ce84a62 100644 --- a/sim/m32r/sim-main.h +++ b/sim/m32r/sim-main.h @@ -3,6 +3,11 @@ #ifndef SIM_MAIN_H #define SIM_MAIN_H +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. */ +#define WITH_SCACHE_PBB 1 + #include "symcat.h" #include "sim-basics.h" #include "cgen-types.h" diff --git a/sim/m32r/tconfig.h b/sim/m32r/tconfig.h index 0a43607416b..42c538ca4b6 100644 --- a/sim/m32r/tconfig.h +++ b/sim/m32r/tconfig.h @@ -6,9 +6,4 @@ /* For MSPR support. FIXME: revisit. */ #define WITH_DEVICES 1 -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. */ -#define WITH_SCACHE_PBB 1 - #endif /* M32R_TCONFIG_H */ diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 92fcf75364c..95e792defda 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * sim-main.h (WITH_SCACHE_PBB): Move from ... + * tconfig.h (WITH_SCACHE_PBB): ... here. + 2015-12-24 Mike Frysinger * tconfig.h (SIM_HANDLES_LMA): Delete. diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h index 7b24ab0e5ca..da8f516f75c 100644 --- a/sim/sh64/sim-main.h +++ b/sim/sh64/sim-main.h @@ -7,6 +7,11 @@ sim-basics.h and cgen-types.h needs config.h. */ #include "config.h" +/* This is a global setting. Different cpu families can't mix-n-match -scache + and -pbb. However some cpu families may use -simple while others use + one of -scache/-pbb. ???? */ +#define WITH_SCACHE_PBB 1 + #include "symcat.h" #include "sim-basics.h" #include "cgen-types.h" diff --git a/sim/sh64/tconfig.h b/sim/sh64/tconfig.h index 4f4d9b74e8d..b4e256f7bee 100644 --- a/sim/sh64/tconfig.h +++ b/sim/sh64/tconfig.h @@ -5,8 +5,3 @@ /* ??? Temporary hack until model support unified. */ #define SIM_HAVE_MODEL - -/* This is a global setting. Different cpu families can't mix-n-match -scache - and -pbb. However some cpu families may use -simple while others use - one of -scache/-pbb. ???? */ -#define WITH_SCACHE_PBB 1 -- 2.30.2