C99 opcodes configury

Alan Modra amodra@gmail.com
Mon Apr 5 05:52:58 GMT 2021


	* configure.ac: Don't check for limits.h, string.h, strings.h or
	stdlib.h.
	(AC_ISC_POSIX): Don't invoke.
	* sysdep.h: Include stdlib.h and string.h unconditionally.
	* i386-opc.h: Include limits.h unconditionally.
	* wasm32-dis.c: Likewise.
	* cgen-opc.c: Don't include alloca-conf.h.
	* config.in: Regenerate.
	* configure: Regenerate.

diff --git a/opcodes/cgen-opc.c b/opcodes/cgen-opc.c
index ff86d45de13..9fdbc6e118b 100644
--- a/opcodes/cgen-opc.c
+++ b/opcodes/cgen-opc.c
@@ -19,7 +19,6 @@
    51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "alloca-conf.h"
 #include <stdio.h>
 #include "ansidecl.h"
 #include "libiberty.h"
diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index c19d2f8c958..7cf0d2968b2 100644
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -22,7 +22,6 @@ AC_INIT([opcodes], BFD_VERSION)
 AC_CONFIG_SRCDIR([z8k-dis.c])
 
 AC_CANONICAL_TARGET
-AC_ISC_POSIX
 
 AM_INIT_AUTOMAKE
 
@@ -84,9 +83,6 @@ BFD_CC_FOR_BUILD
 AC_SUBST(HDEFINES)
 AC_PROG_INSTALL
 
-AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h)
-ACX_HEADER_STRING
-
 AC_CHECK_DECLS([basename, stpcpy])
 
 # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index 60c445f2b40..8f0479b937b 100644
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -19,10 +19,7 @@
    02110-1301, USA.  */
 
 #include "opcode/i386.h"
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#endif
-
 #ifndef CHAR_BIT
 #define CHAR_BIT 8
 #endif
diff --git a/opcodes/sysdep.h b/opcodes/sysdep.h
index 74fbee729f9..dc4fe446ada 100644
--- a/opcodes/sysdep.h
+++ b/opcodes/sysdep.h
@@ -32,25 +32,9 @@
 #endif
 
 #include "config.h"
-
-#include "ansidecl.h"
-
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-
-#ifdef STRING_WITH_STRINGS
-#include <string.h>
-#include <strings.h>
-#else
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#endif
+#include "ansidecl.h"
 
 #if !HAVE_DECL_STPCPY
 extern char *stpcpy (char *__dest, const char *__src);
diff --git a/opcodes/wasm32-dis.c b/opcodes/wasm32-dis.c
index f207cb9a9c3..b701c6d56bd 100644
--- a/opcodes/wasm32-dis.c
+++ b/opcodes/wasm32-dis.c
@@ -29,9 +29,7 @@
 #include "elf/wasm32.h"
 #include <stdint.h>
 
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#endif
 #ifndef CHAR_BIT
 #define CHAR_BIT 8
 #endif

-- 
Alan Modra
Australia Development Lab, IBM


More information about the Binutils mailing list