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.

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index dbc2d0996417cc36d3beaf2076748bd10539140f..416db96a61220b1487f3761135a3976f0d92a130 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_SCACHE_PBB): Move from ...
+       * tconfig.h (WITH_SCACHE_PBB): ... here.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
        * devices.c (device_error): Delete.

diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index 4dc04a2caa605971716735db1d942b84fe3bf6cf..ac91e67d0abe68e276b428b9c20706a80b0c73cb 100644 (file)
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -24,6 +24,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 77b000fe61b0fc62714346ed97278e0aec267f82..05d86233ea016318273de5cc1a55c41051c9e310 100644 (file)
--- a/sim/cris/tconfig.h
+++ b/sim/cris/tconfig.h
@@ -29,9 +29,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 c7a601e7160362bfbca32abd8423dc295d484278..08c6d98650ca62643bbaca478b23818c085362dc 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_SCACHE_PBB): Move from ...
+       * tconfig.h (WITH_SCACHE_PBB): ... here.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
        * devices.c (device_error): Delete.

diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index ef14d64c5ecd6247a55664eaf0bb77aaec52459a..ed5d4e20d693f826ad0d23b87d288c35378ca721 100644 (file)
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -23,6 +23,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
    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 044cfb0712134cd3f68a33081d006f8b84c75b29..1abdc6115771a65bc5ae8ba181de5d13dc8ab7e8 100644 (file)
--- 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 770a2be1e824e85a506ab425da6ca4bab1493d73..45f31d554b70b2eb20fc270ffa2d961b7169a767 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_SCACHE_PBB): Move from ...
+       * tconfig.h (WITH_SCACHE_PBB): ... here.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HANDLES_LMA): Delete.

diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index 992520a0828eb9836be8af74747893c9be55456d..810e4f4252da4b30bccc43b7c414e376fe6c8af5 100644 (file)
--- 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 bd5a3aee8e24e7d094d88c4269ba7debcfb6dd5d..cf63d449ac9c6b1461d91609c2617bea029f7d30 100644 (file)
--- 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 93e7d98dcc545c8e04dd9e62207c6610134126ae..62320b35f190b3d64835d94d0b1ccbdc67472246 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_SCACHE_PBB): Move from ...
+       * tconfig.h (WITH_SCACHE_PBB): ... here.  Delete file.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HANDLES_LMA): Delete.

diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index 4894e8d65b7f336956cd50a70db4eb35b83a135d..13d00cba53d1a7c901c60a403d654d54641f087e 100644 (file)
--- 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 (file)
index 7db04f9..0000000
--- a/sim/lm32/tconfig.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Lattice Mico32 simulator configuration.
-   Contributed by Jon Beniston <jon@beniston.com>
-
-   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 <http://www.gnu.org/licenses/>.  */
-
-#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 7a33412ce0bab85ae3f75c76ea0689f457e2e1fe..f0007432d335df5e905f5ba7dd817b322dd623cf 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_SCACHE_PBB): Move from ...
+       * tconfig.h (WITH_SCACHE_PBB): ... here.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
        * devices.c (device_error): Delete.

diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index cd39e98c021d0896d3ac809a12675eeeee18e203..5b24ce84a62f4c84d2ef07fe1871bed38e67fc25 100644 (file)
--- 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 0a43607416b09f2b1c0e6b172823c96f0e7caf93..42c538ca4b60ddbac1a470e5858a79b5fe24109b 100644 (file)
--- 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 92fcf75364cc49dc5a807547d9db1417d46770b4..95e792defda15374b90f40cc4ee3904305cb4fed 100644 (file)
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (WITH_SCACHE_PBB): Move from ...
+       * tconfig.h (WITH_SCACHE_PBB): ... here.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>
 
        * tconfig.h (SIM_HANDLES_LMA): Delete.

diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
index 7b24ab0e5ca86059a2ca5d186b4e1998322e1312..da8f516f75c590b31c83eb0c5a5bd0c342eb8947 100644 (file)
--- 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 4f4d9b74e8d5eb16f261d0c1d5825756bfa2a1e0..b4e256f7bee19d789d3f8ae9d47af60b47b2806a 100644 (file)
--- 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