Remove bfd_stdint.h

Message ID 20210331002351.GR5425@bubble.grove.modra.org
State New
Headers show
Series
  • Remove bfd_stdint.h
Related show

Commit Message

Nick Clifton via Binutils March 31, 2021, 12:23 a.m.
If we require C99 for binutils then stdint.h is available.

bfd/
	* .gitignore: Delete bfd_stdint.h entry.
	* Makefile.am (bfdinclude_HEADERS): Delete bfd_stdint.h.
	(BUILD_HFILES, LOCAL_H_DEPS): Likewise.
	* bfd-in.h: Include stdint.h in place of bfd_stdint.h.
	* configure.ac: Don't invoke GCC_HEADER_STDINT.
	* configure.com: Don't create bfd_stdint.h.
	* Makefile.in: Regenerate.
	* aclocal.m4: Regenerate.
	* bfd-in2.h: Regenerate.
	* config.in: Regenerate.
	* configure: Regenerate.
	* doc/Makefile.in: Regenerate.
	* po/BLD-POTFILES.in: Regenerate.
binutils/
	* coffdump.c: Include stdint.h in place of bfd_stdint.h.
	* dwarf.c: Likewise.
gas/
	* config/tc-aarch64.c: Include stdint.h in place of bfd_stdint.h.
	* config/tc-crx.c: Likewise.
	* config/tc-nds32.h: Likewise.
include/
	* cgen/basic-modes.h: Include stdint.h in place of bfd_stdint.h.
	* elf/nfp.h: Likewise.
	* opcode/aarch64.h: Likewise.
	* opcode/cgen.h: Likewise.
	* opcode/nfp.h: Likewise.
	* opcode/ppc.h: Likewise.
ld/
	* elf-hints-local.h: Include stdint.h in place of bfd_stdint.h.
	* emultempl/nds32elf.em: Likewise.
	* testsuite/ld-elf/mbind2b.c: Likewise.
	* testsuite/ld-elf/pr18718.c: Likewise.
	* testsuite/ld-elf/pr18720a.c: Likewise.
	* testsuite/ld-elf/pr25749-1.c: Likewise.
	* testsuite/ld-elf/pr25749-1a.c: Likewise.
	* testsuite/ld-elf/pr25749-1b.c: Likewise.
	* testsuite/ld-elf/pr25749-1c.c: Likewise.
	* testsuite/ld-elf/pr25749-1d.c: Likewise.
	* testsuite/ld-elf/pr25749-2.c: Likewise.
	* testsuite/ld-elf/pr25754-1a.c: Likewise.
	* testsuite/ld-elf/pr25754-2a.c: Likewise.
	* testsuite/ld-elf/pr25754-3a.c: Likewise.
	* testsuite/ld-elf/pr25754-4a.c: Likewise.
	* testsuite/ld-elf/pr25754-5a.c: Likewise.
	* testsuite/ld-elf/pr25754-6a.c: Likewise.
opcodes/
	* aarch64-dis.c: Include stdint.h in place of bfd_stdint.h.
	* aarch64-dis.h: Likewise.
	* aarch64-opc.c: Likewise.
	* avr-dis.c: Likewise.
	* csky-dis.c: Likewise.
	* nds32-asm.c: Likewise.
	* nds32-dis.c: Likewise.
	* nfp-dis.c: Likewise.
	* riscv-dis.c: Likewise.
	* s12z-dis.c: Likewise.
	* wasm32-dis.c: Likewise.


-- 
Alan Modra
Australia Development Lab, IBM

Patch

diff --git a/bfd/.gitignore b/bfd/.gitignore
index 33161338b05..0a5530d128a 100644
--- a/bfd/.gitignore
+++ b/bfd/.gitignore
@@ -1,6 +1,5 @@ 
 /bfd-in3.h
 /bfd.h
-/bfd_stdint.h
 /bfdver.h
 /elf32-ia64.c
 /elf32-target.h
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 3f143dc227b..ed2f701805d 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -33,7 +33,7 @@  bfdlibdir = @bfdlibdir@
 bfdincludedir = @bfdincludedir@
 bfdlib_LTLIBRARIES = libbfd.la
 bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-		     bfd_stdint.h $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
+		     $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
 else !INSTALL_LIBBFD
 # Empty these so that the respective installation directories will not be created.
 bfdlibdir =
@@ -700,7 +700,7 @@  SOURCE_HFILES = \
 
 ## ... and .h files which are in the build tree, minus config.h and bfd.h
 BUILD_HFILES = \
-	bfdver.h elf32-target.h elf64-target.h targmatch.h bfd_stdint.h
+	bfdver.h elf32-target.h elf64-target.h targmatch.h
 
 # Ensure they are built early:
 BUILT_SOURCES = $(BUILD_HFILES)
@@ -863,7 +863,7 @@  pex64igen.c: peXXigen.c
 	$(SED) -e s/XX/pex64/g < $< >> $@
 
 BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h
-LOCAL_H_DEPS= libbfd.h sysdep.h config.h bfd_stdint.h
+LOCAL_H_DEPS= libbfd.h sysdep.h config.h
 $(BFD32_LIBS) \
  $(BFD64_LIBS) \
  $(ALL_MACHINES) \
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index f90f7180911..46a0fcd4417 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -34,7 +34,7 @@  extern "C" {
 
 #include "ansidecl.h"
 #include "symcat.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "diagnostics.h"
 #include <stdarg.h>
 #include <string.h>
diff --git a/bfd/configure.ac b/bfd/configure.ac
index e9a07b8ff05..cb43ebcf6de 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -246,7 +246,6 @@  BFD_CC_FOR_BUILD
 AC_CHECK_HEADERS(alloca.h fcntl.h limits.h stddef.h stdlib.h string.h \
 		 strings.h sys/file.h sys/resource.h sys/stat.h sys/time.h \
 		 time.h unistd.h wchar.h wctype.h)
-GCC_HEADER_STDINT(bfd_stdint.h)
 AC_HEADER_TIME
 AC_HEADER_DIRENT
 
diff --git a/bfd/configure.com b/bfd/configure.com
index cb93a65331d..33012fbc1ef 100644
--- a/bfd/configure.com
+++ b/bfd/configure.com
@@ -239,13 +239,6 @@  $DECK
 $  EOD
 $!
 $!
-$! create bfd_stdint.h
-$!
-$ write sys$output "Generate `bfd_stdint.h'"
-$ create []bfd_stdint.h
-#include <inttypes.h>
-$!
-$!
 $! create targmatch.h
 $!
 $ write sys$output "Generate `targmatch.h'"
diff --git a/binutils/coffdump.c b/binutils/coffdump.c
index 5ce39859d56..dd40221b45d 100644
--- a/binutils/coffdump.c
+++ b/binutils/coffdump.c
@@ -26,7 +26,7 @@ 
 
 #include "sysdep.h"
 #include "bfd.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "libiberty.h"
 #include "bucomm.h"
 
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 23ee70510f7..476e3919d1f 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -21,7 +21,7 @@ 
 #include "sysdep.h"
 #include "libiberty.h"
 #include "bfd.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "bucomm.h"
 #include "elfcomm.h"
 #include "elf/common.h"
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 6f782d057f8..9dd1defd09b 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -22,7 +22,7 @@ 
 #include "as.h"
 #include <limits.h>
 #include <stdarg.h>
-#include "bfd_stdint.h"
+#include <stdint.h>
 #define	 NO_RELOC 0
 #include "safe-ctype.h"
 #include "subsegs.h"
diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index 52eebcb7e94..a82acb5fa21 100644
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -23,7 +23,7 @@ 
    MA 02110-1301, USA.  */
 
 #include "as.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "safe-ctype.h"
 #include "dwarf2dbg.h"
 #include "opcode/crx.h"
diff --git a/gas/config/tc-nds32.h b/gas/config/tc-nds32.h
index 7dbeb591b58..a74390a57e7 100644
--- a/gas/config/tc-nds32.h
+++ b/gas/config/tc-nds32.h
@@ -22,7 +22,7 @@ 
 #ifndef TC_NDS32
 #define TC_NDS32
 
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 /* Enum mapping symbol.  */
 enum mstate
diff --git a/gas/config/tc-pru.c b/gas/config/tc-pru.c
index 5c41fa08f2a..139e28ecbae 100644
--- a/gas/config/tc-pru.c
+++ b/gas/config/tc-pru.c
@@ -21,7 +21,7 @@ 
    02110-1301, USA.  */
 
 #include "as.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "opcode/pru.h"
 #include "elf/pru.h"
 #include "tc-pru.h"
diff --git a/include/cgen/basic-modes.h b/include/cgen/basic-modes.h
index 3a476d4a1df..2d76594524c 100644
--- a/include/cgen/basic-modes.h
+++ b/include/cgen/basic-modes.h
@@ -24,12 +24,10 @@ 
 
 /* This file doesn't contain all modes,
    just the basic/portable ones.
-   It also provides access to stdint.h (*1) so the includer doesn't have
-   to deal with the portability issues.
-   (*1): To the extent that bfd_stdint.h does for now.  */
+   It also provides access to stdint.h so the includer doesn't have
+   to deal with the portability issues.  */
 
-/* IWBN to avoid unnecessary dependencies on bfd-anything.  */
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 typedef int8_t QI;
 typedef uint8_t UQI;
diff --git a/include/elf/nfp.h b/include/elf/nfp.h
index ae5f4f8e064..ca609c19967 100644
--- a/include/elf/nfp.h
+++ b/include/elf/nfp.h
@@ -24,7 +24,7 @@ 
 #include "bfd.h"
 #include "elf/common.h"
 #include "elf/reloc-macros.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h
index e48bea6db6e..7a97fa837f6 100644
--- a/include/opcode/aarch64.h
+++ b/include/opcode/aarch64.h
@@ -23,7 +23,7 @@ 
 #define OPCODE_AARCH64_H
 
 #include "bfd.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h
index 0e68c85dfec..8b7d2a4b547 100644
--- a/include/opcode/cgen.h
+++ b/include/opcode/cgen.h
@@ -24,8 +24,7 @@ 
 #include "symcat.h"
 #include "cgen/bitset.h"
 
-/* ??? IWBN to replace bfd in the name.  */
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/opcode/nfp.h b/include/opcode/nfp.h
index 7f322a100ed..88c7d08f483 100644
--- a/include/opcode/nfp.h
+++ b/include/opcode/nfp.h
@@ -23,7 +23,7 @@ 
 #define _NFP_H_
 
 #include "bfd.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "elf/nfp.h"
 
 #ifdef __cplusplus
diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index a5ee560aa17..1c5f383e209 100644
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -22,7 +22,7 @@ 
 #ifndef PPC_H
 #define PPC_H
 
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ld/elf-hints-local.h b/ld/elf-hints-local.h
index 02dd019d491..9cdfa2f2981 100644
--- a/ld/elf-hints-local.h
+++ b/ld/elf-hints-local.h
@@ -25,7 +25,7 @@ 
 #ifndef	_ELF_HINTS_H_
 #define	_ELF_HINTS_H_
 
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 /* Hints file produced by ldconfig.  */
 struct elfhints_hdr
diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em
index 0ebdec95655..b00b7746cca 100644
--- a/ld/emultempl/nds32elf.em
+++ b/ld/emultempl/nds32elf.em
@@ -24,7 +24,7 @@  fragment <<EOF
 
 #include "elf-bfd.h"
 #include "elf/nds32.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "elf32-nds32.h"
 
 static int relax_fp_as_gp = 1;		/* --mrelax-omit-fp  */
diff --git a/ld/testsuite/ld-elf/mbind2b.c b/ld/testsuite/ld-elf/mbind2b.c
index 10922a1f046..7e1367d6b0f 100644
--- a/ld/testsuite/ld-elf/mbind2b.c
+++ b/ld/testsuite/ld-elf/mbind2b.c
@@ -1,6 +1,6 @@ 
 #include <stdio.h>
 #include <stdlib.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern char bss_in_mbind0;
 extern char data_in_mbind3;
diff --git a/ld/testsuite/ld-elf/pr18718.c b/ld/testsuite/ld-elf/pr18718.c
index 426f46a42cb..bbf8e037c13 100644
--- a/ld/testsuite/ld-elf/pr18718.c
+++ b/ld/testsuite/ld-elf/pr18718.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern void foo (void);
 extern void check_ptr_eq (void (*) (void), void (*) (void));
diff --git a/ld/testsuite/ld-elf/pr18720a.c b/ld/testsuite/ld-elf/pr18720a.c
index b4a33696c6d..fec4cf902ff 100644
--- a/ld/testsuite/ld-elf/pr18720a.c
+++ b/ld/testsuite/ld-elf/pr18720a.c
@@ -1,4 +1,4 @@ 
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern void bar (void);
 extern void foo (void);
diff --git a/ld/testsuite/ld-elf/pr25749-1.c b/ld/testsuite/ld-elf/pr25749-1.c
index 12d0574a013..249d80fd169 100644
--- a/ld/testsuite/ld-elf/pr25749-1.c
+++ b/ld/testsuite/ld-elf/pr25749-1.c
@@ -1,12 +1,12 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern intptr_t size (void);
 
 int
 main ()
 {
-  if (size () == 303 /* size of this file */)
+  if (size () == 299 /* size of this file */)
     printf ("PASS\n");
 #ifdef __GLIBC_PREREQ
 # if !__GLIBC_PREREQ (2, 28)
diff --git a/ld/testsuite/ld-elf/pr25749-1a.c b/ld/testsuite/ld-elf/pr25749-1a.c
index 775623b8c9c..657d29da5b1 100644
--- a/ld/testsuite/ld-elf/pr25749-1a.c
+++ b/ld/testsuite/ld-elf/pr25749-1a.c
@@ -1,4 +1,4 @@ 
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern void *_binary_pr25749_1_c_start;
 extern void *_binary_pr25749_1_c_end;
diff --git a/ld/testsuite/ld-elf/pr25749-1b.c b/ld/testsuite/ld-elf/pr25749-1b.c
index f02a4087004..328b47cf51f 100644
--- a/ld/testsuite/ld-elf/pr25749-1b.c
+++ b/ld/testsuite/ld-elf/pr25749-1b.c
@@ -1,4 +1,4 @@ 
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern void *_binary_pr25749_1_c_size;
 
diff --git a/ld/testsuite/ld-elf/pr25749-1c.c b/ld/testsuite/ld-elf/pr25749-1c.c
index f2847d7f623..3203624fb41 100644
--- a/ld/testsuite/ld-elf/pr25749-1c.c
+++ b/ld/testsuite/ld-elf/pr25749-1c.c
@@ -1,4 +1,4 @@ 
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern void *_binary_pr25749_1_c_size __attribute__ ((visibility("hidden")));
 
diff --git a/ld/testsuite/ld-elf/pr25749-1d.c b/ld/testsuite/ld-elf/pr25749-1d.c
index 33b869deb5d..361d74c6c88 100644
--- a/ld/testsuite/ld-elf/pr25749-1d.c
+++ b/ld/testsuite/ld-elf/pr25749-1d.c
@@ -1,4 +1,4 @@ 
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern void *_binary_pr25749_1_c_start;
 extern void *_binary_pr25749_1_c_end;
diff --git a/ld/testsuite/ld-elf/pr25749-2.c b/ld/testsuite/ld-elf/pr25749-2.c
index 3ef6f0c6a7b..9a1b2b802f5 100644
--- a/ld/testsuite/ld-elf/pr25749-2.c
+++ b/ld/testsuite/ld-elf/pr25749-2.c
@@ -1,12 +1,12 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern intptr_t size;
 
 int
 main ()
 {
-  if (size == 293 /* size of this file */)
+  if (size == 289 /* size of this file */)
     printf ("PASS\n");
 #ifdef __GLIBC_PREREQ
 # if !__GLIBC_PREREQ (2, 28)
diff --git a/ld/testsuite/ld-elf/pr25754-1a.c b/ld/testsuite/ld-elf/pr25754-1a.c
index 2b048ec09bb..bc65c174d05 100644
--- a/ld/testsuite/ld-elf/pr25754-1a.c
+++ b/ld/testsuite/ld-elf/pr25754-1a.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern uintptr_t bar;
 
diff --git a/ld/testsuite/ld-elf/pr25754-2a.c b/ld/testsuite/ld-elf/pr25754-2a.c
index 7c9f58116e7..7c7fb28f4d5 100644
--- a/ld/testsuite/ld-elf/pr25754-2a.c
+++ b/ld/testsuite/ld-elf/pr25754-2a.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern uintptr_t bar;
 
diff --git a/ld/testsuite/ld-elf/pr25754-3a.c b/ld/testsuite/ld-elf/pr25754-3a.c
index 2d4f02abe5a..e57dfe2cc2d 100644
--- a/ld/testsuite/ld-elf/pr25754-3a.c
+++ b/ld/testsuite/ld-elf/pr25754-3a.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern uintptr_t bar;
 
diff --git a/ld/testsuite/ld-elf/pr25754-4a.c b/ld/testsuite/ld-elf/pr25754-4a.c
index e2c2f8d54d0..1148ecae728 100644
--- a/ld/testsuite/ld-elf/pr25754-4a.c
+++ b/ld/testsuite/ld-elf/pr25754-4a.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern uintptr_t *get_bar (void);
 
diff --git a/ld/testsuite/ld-elf/pr25754-5a.c b/ld/testsuite/ld-elf/pr25754-5a.c
index cb791dd56f7..8ddfccd5bd0 100644
--- a/ld/testsuite/ld-elf/pr25754-5a.c
+++ b/ld/testsuite/ld-elf/pr25754-5a.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern uintptr_t *get_bar (void);
 
diff --git a/ld/testsuite/ld-elf/pr25754-6a.c b/ld/testsuite/ld-elf/pr25754-6a.c
index 59633a3b4dd..b8e7ade4c6d 100644
--- a/ld/testsuite/ld-elf/pr25754-6a.c
+++ b/ld/testsuite/ld-elf/pr25754-6a.c
@@ -1,5 +1,5 @@ 
 #include <stdio.h>
-#include <bfd_stdint.h>
+#include <stdint.h>
 
 extern uintptr_t *get_bar (void);
 
diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c
index 349d7ea7ec0..1472f7da155 100644
--- a/opcodes/aarch64-dis.c
+++ b/opcodes/aarch64-dis.c
@@ -19,7 +19,7 @@ 
    see <http://www.gnu.org/licenses/>.  */
 
 #include "sysdep.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "disassemble.h"
 #include "libiberty.h"
 #include "opintl.h"
diff --git a/opcodes/aarch64-dis.h b/opcodes/aarch64-dis.h
index 5bb546a6636..97045114a2e 100644
--- a/opcodes/aarch64-dis.h
+++ b/opcodes/aarch64-dis.h
@@ -20,7 +20,7 @@ 
 
 #ifndef OPCODES_AARCH64_DIS_H
 #define OPCODES_AARCH64_DIS_H
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "aarch64-opc.h"
 
 /* Lookup opcode WORD in the opcode table.
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index c4397bc4301..1f04aad5f98 100644
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -22,7 +22,7 @@ 
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include <stdarg.h>
 #include <inttypes.h>
 
diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c
index b58958fae7a..06f8a0c663b 100644
--- a/opcodes/avr-dis.c
+++ b/opcodes/avr-dis.c
@@ -25,7 +25,7 @@ 
 #include "disassemble.h"
 #include "opintl.h"
 #include "libiberty.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 struct avr_opcodes_s
 {
diff --git a/opcodes/csky-dis.c b/opcodes/csky-dis.c
index 399c180a8dd..45af88c8928 100644
--- a/opcodes/csky-dis.c
+++ b/opcodes/csky-dis.c
@@ -22,7 +22,7 @@ 
 #include "sysdep.h"
 #include "config.h"
 #include <stdio.h>
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include <elf/csky.h>
 #include "disassemble.h"
 #include "elf-bfd.h"
diff --git a/opcodes/nds32-asm.c b/opcodes/nds32-asm.c
index d2f41f5c00b..f641c60f68c 100644
--- a/opcodes/nds32-asm.c
+++ b/opcodes/nds32-asm.c
@@ -22,7 +22,7 @@ 
 
 #include "sysdep.h"
 
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include <assert.h>
 
 #include "safe-ctype.h"
diff --git a/opcodes/nds32-dis.c b/opcodes/nds32-dis.c
index 96c3f3829c1..25bb475d1ab 100644
--- a/opcodes/nds32-dis.c
+++ b/opcodes/nds32-dis.c
@@ -27,7 +27,7 @@ 
 #include "symcat.h"
 #include "libiberty.h"
 #include "opintl.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include "hashtab.h"
 #include "nds32-asm.h"
 #include "opcode/nds32.h"
diff --git a/opcodes/nfp-dis.c b/opcodes/nfp-dis.c
index 4f79581d60b..39ded6694ab 100644
--- a/opcodes/nfp-dis.c
+++ b/opcodes/nfp-dis.c
@@ -33,7 +33,7 @@ 
 #include "opintl.h"
 #include "elf-bfd.h"
 #include "bfd.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 #define _NFP_ERR_STOP -1
 #define _NFP_ERR_CONT -8
diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c
index cc80d909457..7ef4d4df184 100644
--- a/opcodes/riscv-dis.c
+++ b/opcodes/riscv-dis.c
@@ -29,7 +29,7 @@ 
 #include "elf/riscv.h"
 #include "cpu-riscv.h"
 
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include <ctype.h>
 
 static enum riscv_spec_class default_priv_spec = PRIV_SPEC_CLASS_NONE;
diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c
index 66452977595..4616bc82711 100644
--- a/opcodes/s12z-dis.c
+++ b/opcodes/s12z-dis.c
@@ -20,7 +20,7 @@ 
 
 #include "sysdep.h"
 #include <stdio.h>
-#include "bfd_stdint.h"
+#include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
 
diff --git a/opcodes/wasm32-dis.c b/opcodes/wasm32-dis.c
index 69266610ad3..f3fde3286e7 100644
--- a/opcodes/wasm32-dis.c
+++ b/opcodes/wasm32-dis.c
@@ -27,7 +27,7 @@ 
 #include "elf-bfd.h"
 #include "elf/internal.h"
 #include "elf/wasm32.h"
-#include "bfd_stdint.h"
+#include <stdint.h>
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>