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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8c4eab197ac4fe2540265cf89238f24efa7bfcb5..9a007c79db9577b4f38b5d13fdf55ffeeeeb6c86 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-31  Alan Modra  <amodra@gmail.com>
+
+       * 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  <amodra@gmail.com>
 
        * as.h (POISON_BFD_BOOLEAN): Define.

diff --git a/gas/config/bfin-lex-wrapper.c b/gas/config/bfin-lex-wrapper.c
index 010c37cbba2a40d95944600afd0a1c645444a8e9..9c08e8c48cfe08b289be2bce8177ca03c6a482a9 100644 (file)
--- 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 be72a18e93461d3bcc799a09f00b99bd415966ba..eaaaf7427032165b0fdeb7dd4a140a6eed83c7ba 100644 (file)
--- 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 385caddd9243e50c3538d71015ecd2c007092f72..01ee7a0c071fdd9f6b6e080782b5c4231b17ae62 100644 (file)
--- 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 9b1e6f0d131cd09e4790d76a8f3c48b62c9e04e7..03ef518a01ffa7eff031913bce7c4cde56b2e843 100644 (file)
--- 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 <itbl-parse.h>