From fdb21288ca98d0ebb7819a752631a31aa0010be3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 31 Mar 2021 18:15:46 +1030 Subject: [PATCH] Don't include bfd/sysdep.h for gas files * itbl-lex-wrapper.c: Include as.h not sysdep.h. * config/bfin-lex-wrapper.c: Likewise. * itbl-lex.l: Don't include as.h. * config/bfin-lex.l: Likewise. --- gas/ChangeLog | 7 +++++++ gas/config/bfin-lex-wrapper.c | 4 ++-- gas/config/bfin-lex.l | 2 -- gas/itbl-lex-wrapper.c | 4 ++-- gas/itbl-lex.l | 1 - 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 8c4eab197ac..9a007c79db9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2021-03-31 Alan Modra + + * itbl-lex-wrapper.c: Include as.h not sysdep.h. + * config/bfin-lex-wrapper.c: Likewise. + * itbl-lex.l: Don't include as.h. + * config/bfin-lex.l: Likewise. + 2021-03-31 Alan Modra * as.h (POISON_BFD_BOOLEAN): Define. diff --git a/gas/config/bfin-lex-wrapper.c b/gas/config/bfin-lex-wrapper.c index 010c37cbba2..9c08e8c48cf 100644 --- a/gas/config/bfin-lex-wrapper.c +++ b/gas/config/bfin-lex-wrapper.c @@ -18,8 +18,8 @@ 02110-1301, USA. */ /* The C source file generated by flex includes stdio.h before any of - the C code in bfin-lex.l. Make sure we include sysdep.h first, so + the C code in bfin-lex.l. Make sure we include as.h first, so that config.h can set the correct values for various things. */ -#include "sysdep.h" +#include "as.h" #include "config/bfin-lex.c" diff --git a/gas/config/bfin-lex.l b/gas/config/bfin-lex.l index be72a18e934..eaaaf742703 100644 --- a/gas/config/bfin-lex.l +++ b/gas/config/bfin-lex.l @@ -20,8 +20,6 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ %{ - -#include "as.h" #include "bfin-defs.h" #include "config/bfin-parse.h" diff --git a/gas/itbl-lex-wrapper.c b/gas/itbl-lex-wrapper.c index 385caddd924..01ee7a0c071 100644 --- a/gas/itbl-lex-wrapper.c +++ b/gas/itbl-lex-wrapper.c @@ -18,8 +18,8 @@ 02110-1301, USA. */ /* The C source file generated by flex includes stdio.h before any of - the C code in itbl-lex.l. Make sure we include sysdep.h first, so + the C code in itbl-lex.l. Make sure we include as.h first, so that config.h can set the correct values for various things. */ -#include "sysdep.h" +#include "as.h" #include "itbl-lex.c" diff --git a/gas/itbl-lex.l b/gas/itbl-lex.l index 9b1e6f0d131..03ef518a01f 100644 --- a/gas/itbl-lex.l +++ b/gas/itbl-lex.l @@ -21,7 +21,6 @@ 02110-1301, USA. */ %{ -#include "as.h" #include "itbl-lex.h" #include -- 2.30.2