Remove use of bfd_uint64_t and similar

Requiring C99 means that uses of bfd_uint64_t can be replaced with
uint64_t, and similarly for bfd_int64_t, BFD_HOST_U_64_BIT, and
BFD_HOST_64_BIT.  This patch does that, removes #ifdef BFD_HOST_*
and tidies a few places that print 64-bit values.

3 files changed, 33 insertions, 33 deletions

diff --git a/include/elf/nfp.h b/include/elf/nfp.h
index 5a06051196..c89cefff27 100644
--- a/include/elf/nfp.h
+++ b/include/elf/nfp.h
@@ -102,7 +102,7 @@ extern "C"
 #define SHF_NFP_INIT		0x80000000
 #define SHF_NFP_INIT2		0x40000000
 #define SHF_NFP_SCS(shf)	(((shf) >> 32) & 0xFF)
-#define SHF_NFP_SET_SCS(v)	(((BFD_HOST_U_64_BIT)((v) & 0xFF)) << 32)
+#define SHF_NFP_SET_SCS(v)	((uint64_t) ((v) & 0xFF) << 32)
 
 /* NFP Section Info
    For PROGBITS and NOBITS sections:
diff --git a/include/opcode/csky.h b/include/opcode/csky.h
index ed00bfd7cd..faecba1161 100644
--- a/include/opcode/csky.h
+++ b/include/opcode/csky.h
@@ -22,46 +22,46 @@
 #include "dis-asm.h"
 
 /* The following bitmasks control instruction set architecture.  */
-#define CSKYV1_ISA_E1       ((bfd_uint64_t)1 << 0)
-#define CSKYV2_ISA_E1       ((bfd_uint64_t)1 << 1)
-#define CSKYV2_ISA_1E2      ((bfd_uint64_t)1 << 2)
-#define CSKYV2_ISA_2E3      ((bfd_uint64_t)1 << 3)
-#define CSKYV2_ISA_3E7      ((bfd_uint64_t)1 << 4)
-#define CSKYV2_ISA_7E10     ((bfd_uint64_t)1 << 5)
-#define CSKYV2_ISA_3E3R1    ((bfd_uint64_t)1 << 6)
-#define CSKYV2_ISA_3E3R2    ((bfd_uint64_t)1 << 7)
-#define CSKYV2_ISA_10E60    ((bfd_uint64_t)1 << 8)
-#define CSKYV2_ISA_3E3R3    ((bfd_uint64_t)1 << 9)
-
-#define CSKY_ISA_TRUST      ((bfd_uint64_t)1 << 11)
-#define CSKY_ISA_CACHE      ((bfd_uint64_t)1 << 12)
-#define CSKY_ISA_NVIC       ((bfd_uint64_t)1 << 13)
-#define CSKY_ISA_CP         ((bfd_uint64_t)1 << 14)
-#define CSKY_ISA_MP         ((bfd_uint64_t)1 << 15)
-#define CSKY_ISA_MP_1E2     ((bfd_uint64_t)1 << 16)
-#define CSKY_ISA_JAVA       ((bfd_uint64_t)1 << 17)
-#define CSKY_ISA_MAC        ((bfd_uint64_t)1 << 18)
-#define CSKY_ISA_MAC_DSP    ((bfd_uint64_t)1 << 19)
+#define CSKYV1_ISA_E1       ((uint64_t) 1 << 0)
+#define CSKYV2_ISA_E1       ((uint64_t) 1 << 1)
+#define CSKYV2_ISA_1E2      ((uint64_t) 1 << 2)
+#define CSKYV2_ISA_2E3      ((uint64_t) 1 << 3)
+#define CSKYV2_ISA_3E7      ((uint64_t) 1 << 4)
+#define CSKYV2_ISA_7E10     ((uint64_t) 1 << 5)
+#define CSKYV2_ISA_3E3R1    ((uint64_t) 1 << 6)
+#define CSKYV2_ISA_3E3R2    ((uint64_t) 1 << 7)
+#define CSKYV2_ISA_10E60    ((uint64_t) 1 << 8)
+#define CSKYV2_ISA_3E3R3    ((uint64_t) 1 << 9)
+
+#define CSKY_ISA_TRUST      ((uint64_t) 1 << 11)
+#define CSKY_ISA_CACHE      ((uint64_t) 1 << 12)
+#define CSKY_ISA_NVIC       ((uint64_t) 1 << 13)
+#define CSKY_ISA_CP         ((uint64_t) 1 << 14)
+#define CSKY_ISA_MP         ((uint64_t) 1 << 15)
+#define CSKY_ISA_MP_1E2     ((uint64_t) 1 << 16)
+#define CSKY_ISA_JAVA       ((uint64_t) 1 << 17)
+#define CSKY_ISA_MAC        ((uint64_t) 1 << 18)
+#define CSKY_ISA_MAC_DSP    ((uint64_t) 1 << 19)
 
 /* Base ISA for csky v1 and v2.  */
-#define CSKY_ISA_DSP        ((bfd_uint64_t)1 << 20)
-#define CSKY_ISA_DSP_1E2    ((bfd_uint64_t)1 << 21)
-#define CSKY_ISA_DSP_ENHANCE ((bfd_uint64_t)1 << 22)
-#define CSKY_ISA_DSPE60     ((bfd_uint64_t)1 << 23)
+#define CSKY_ISA_DSP        ((uint64_t) 1 << 20)
+#define CSKY_ISA_DSP_1E2    ((uint64_t) 1 << 21)
+#define CSKY_ISA_DSP_ENHANCE ((uint64_t) 1 << 22)
+#define CSKY_ISA_DSPE60     ((uint64_t) 1 << 23)
 
 /* Base float instruction (803f & 810f).  */
-#define CSKY_ISA_FLOAT_E1   ((bfd_uint64_t)1 << 25)
+#define CSKY_ISA_FLOAT_E1   ((uint64_t) 1 << 25)
 /* M_FLOAT support (810f).  */
-#define CSKY_ISA_FLOAT_1E2  ((bfd_uint64_t)1 << 26)
+#define CSKY_ISA_FLOAT_1E2  ((uint64_t) 1 << 26)
 /* 803 support (803f).  */
-#define CSKY_ISA_FLOAT_1E3  ((bfd_uint64_t)1 << 27)
+#define CSKY_ISA_FLOAT_1E3  ((uint64_t) 1 << 27)
 /* 807 support (803f & 807f).  */
-#define CSKY_ISA_FLOAT_3E4  ((bfd_uint64_t)1 << 28)
+#define CSKY_ISA_FLOAT_3E4  ((uint64_t) 1 << 28)
 /* 860 support.  */
-#define CSKY_ISA_FLOAT_7E60 ((bfd_uint64_t)1 << 36)
+#define CSKY_ISA_FLOAT_7E60 ((uint64_t) 1 << 36)
 /* Vector DSP support.  */
-#define CSKY_ISA_VDSP       ((bfd_uint64_t)1 << 29)
-#define CSKY_ISA_VDSP_2     ((bfd_uint64_t)1 << 30)
+#define CSKY_ISA_VDSP       ((uint64_t) 1 << 29)
+#define CSKY_ISA_VDSP_2     ((uint64_t) 1 << 30)
 
 /* The following bitmasks control cpu architecture for CSKY.  */
 #define CSKY_ABI_V1         (1 << 28)
diff --git a/include/opcode/ia64.h b/include/opcode/ia64.h
index fbdd8f14e6..42a6812c3f 100644
--- a/include/opcode/ia64.h
+++ b/include/opcode/ia64.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-typedef BFD_HOST_U_64_BIT ia64_insn;
+typedef uint64_t ia64_insn;
 
 enum ia64_insn_type
   {