diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-05-01 18:05:23 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-05-16 22:38:41 -0400 |
| commit | 6df01ab8ab8509b04f86d7da069ec2d25eb31bf9 (patch) | |
| tree | 21a00924bc74b7d5ec239a133d223f9d52f1dd67 /sim/iq2000 | |
| parent | 681eb80f1217f66c83dec4a3db83577a2a09f74a (diff) | |
| download | gdb-6df01ab8ab8509b04f86d7da069ec2d25eb31bf9.zip gdb-6df01ab8ab8509b04f86d7da069ec2d25eb31bf9.tar.gz gdb-6df01ab8ab8509b04f86d7da069ec2d25eb31bf9.tar.bz2 | |
sim: switch config.h usage to defs.h
The defs.h header will take care of including the various config.h
headers. For now, it's just config.h, but we'll add more when we
integrate gnulib in.
This header should be used instead of config.h, and should be the
first include in every .c file. We won't rely on the old behavior
where we expected files to include the port's sim-main.h which then
includes the common sim-basics.h which then includes config.h. We
have a ton of code that includes things before sim-main.h, and it
sometimes needs to be that way. Creating a dedicated header avoids
the ordering mess and implicit inclusion that shows up otherwise.
Diffstat (limited to 'sim/iq2000')
| -rw-r--r-- | sim/iq2000/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/iq2000/iq2000.c | 3 | ||||
| -rw-r--r-- | sim/iq2000/sim-if.c | 3 | ||||
| -rw-r--r-- | sim/iq2000/sim-main.h | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 1f90b57..b21e075 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,5 +1,10 @@ 2021-05-16 Mike Frysinger <vapier@gentoo.org> + * iq2000.c, sim-if.c: Include defs.h. + * sim-main.h: Delete config.h include. + +2021-05-16 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. 2021-05-04 Tom Tromey <tromey@adacore.com> diff --git a/sim/iq2000/iq2000.c b/sim/iq2000/iq2000.c index 66d7b47..018c6a6 100644 --- a/sim/iq2000/iq2000.c +++ b/sim/iq2000/iq2000.c @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +/* This must come before any other includes. */ +#include "defs.h" + #define WANT_CPU #define WANT_CPU_IQ2000BF diff --git a/sim/iq2000/sim-if.c b/sim/iq2000/sim-if.c index 4db2e4d..b363eb0 100644 --- a/sim/iq2000/sim-if.c +++ b/sim/iq2000/sim-if.c @@ -17,6 +17,9 @@ 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/>. */ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" #include <stdlib.h> diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h index 829f9bb..d0ae1cf 100644 --- a/sim/iq2000/sim-main.h +++ b/sim/iq2000/sim-main.h @@ -4,10 +4,6 @@ #ifndef SIM_MAIN_H #define SIM_MAIN_H -/* sim-basics.h includes config.h but cgen-types.h must be included before - 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. ???? */ |