aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/aix386-core.c6
-rw-r--r--bfd/bfd-in.h24
-rw-r--r--bfd/bfd-in2.h36
-rw-r--r--bfd/coff-rs6000.c10
-rw-r--r--bfd/coff-x86_64.c2
-rw-r--r--bfd/cpu-ia64-opc.c22
-rw-r--r--bfd/dwarf2.c83
-rw-r--r--bfd/elf32-score.c16
-rw-r--r--bfd/elf64-ia64-vms.c8
-rw-r--r--bfd/elflink.c16
-rw-r--r--bfd/elfxx-ia64.c6
-rw-r--r--bfd/hppabsd-core.c6
-rw-r--r--bfd/hpux-core.c6
-rw-r--r--bfd/irix-core.c6
-rw-r--r--bfd/libbfd.c65
-rw-r--r--bfd/mach-o.c2
-rw-r--r--bfd/mach-o.h8
-rw-r--r--bfd/netbsd-core.c6
-rw-r--r--bfd/osf-core.c6
-rw-r--r--bfd/ptrace-core.c6
-rw-r--r--bfd/sco5-core.c6
-rw-r--r--bfd/targets.c12
-rw-r--r--bfd/trad-core.c6
-rw-r--r--bfd/vms-alpha.c2
24 files changed, 156 insertions, 210 deletions
diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c
index 3443e49..977a6bd 100644
--- a/bfd/aix386-core.c
+++ b/bfd/aix386-core.c
@@ -220,9 +220,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_aix386_vec =
{
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index a1c4bf1..09c5728e 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -116,10 +116,10 @@ typedef struct bfd bfd;
#error No 64 bit integer type available
#endif /* ! defined (BFD_HOST_64_BIT) */
-typedef BFD_HOST_U_64_BIT bfd_vma;
-typedef BFD_HOST_64_BIT bfd_signed_vma;
-typedef BFD_HOST_U_64_BIT bfd_size_type;
-typedef BFD_HOST_U_64_BIT symvalue;
+typedef uint64_t bfd_vma;
+typedef int64_t bfd_signed_vma;
+typedef uint64_t bfd_size_type;
+typedef uint64_t symvalue;
#if BFD_HOST_64BIT_LONG
#define BFD_VMA_FMT "l"
@@ -447,10 +447,10 @@ extern bool bfd_record_phdr
/* Byte swapping routines. */
-bfd_uint64_t bfd_getb64 (const void *);
-bfd_uint64_t bfd_getl64 (const void *);
-bfd_int64_t bfd_getb_signed_64 (const void *);
-bfd_int64_t bfd_getl_signed_64 (const void *);
+uint64_t bfd_getb64 (const void *);
+uint64_t bfd_getl64 (const void *);
+int64_t bfd_getb_signed_64 (const void *);
+int64_t bfd_getl_signed_64 (const void *);
bfd_vma bfd_getb32 (const void *);
bfd_vma bfd_getl32 (const void *);
bfd_signed_vma bfd_getb_signed_32 (const void *);
@@ -459,8 +459,8 @@ bfd_vma bfd_getb16 (const void *);
bfd_vma bfd_getl16 (const void *);
bfd_signed_vma bfd_getb_signed_16 (const void *);
bfd_signed_vma bfd_getl_signed_16 (const void *);
-void bfd_putb64 (bfd_uint64_t, void *);
-void bfd_putl64 (bfd_uint64_t, void *);
+void bfd_putb64 (uint64_t, void *);
+void bfd_putl64 (uint64_t, void *);
void bfd_putb32 (bfd_vma, void *);
void bfd_putl32 (bfd_vma, void *);
void bfd_putb24 (bfd_vma, void *);
@@ -470,8 +470,8 @@ void bfd_putl16 (bfd_vma, void *);
/* Byte swapping routines which take size and endiannes as arguments. */
-bfd_uint64_t bfd_get_bits (const void *, int, bool);
-void bfd_put_bits (bfd_uint64_t, void *, int, bool);
+uint64_t bfd_get_bits (const void *, int, bool);
+void bfd_put_bits (uint64_t, void *, int, bool);
/* mmap hacks */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 50e26fc..d50885e 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -123,10 +123,10 @@ typedef struct bfd bfd;
#error No 64 bit integer type available
#endif /* ! defined (BFD_HOST_64_BIT) */
-typedef BFD_HOST_U_64_BIT bfd_vma;
-typedef BFD_HOST_64_BIT bfd_signed_vma;
-typedef BFD_HOST_U_64_BIT bfd_size_type;
-typedef BFD_HOST_U_64_BIT symvalue;
+typedef uint64_t bfd_vma;
+typedef int64_t bfd_signed_vma;
+typedef uint64_t bfd_size_type;
+typedef uint64_t symvalue;
#if BFD_HOST_64BIT_LONG
#define BFD_VMA_FMT "l"
@@ -454,10 +454,10 @@ extern bool bfd_record_phdr
/* Byte swapping routines. */
-bfd_uint64_t bfd_getb64 (const void *);
-bfd_uint64_t bfd_getl64 (const void *);
-bfd_int64_t bfd_getb_signed_64 (const void *);
-bfd_int64_t bfd_getl_signed_64 (const void *);
+uint64_t bfd_getb64 (const void *);
+uint64_t bfd_getl64 (const void *);
+int64_t bfd_getb_signed_64 (const void *);
+int64_t bfd_getl_signed_64 (const void *);
bfd_vma bfd_getb32 (const void *);
bfd_vma bfd_getl32 (const void *);
bfd_signed_vma bfd_getb_signed_32 (const void *);
@@ -466,8 +466,8 @@ bfd_vma bfd_getb16 (const void *);
bfd_vma bfd_getl16 (const void *);
bfd_signed_vma bfd_getb_signed_16 (const void *);
bfd_signed_vma bfd_getl_signed_16 (const void *);
-void bfd_putb64 (bfd_uint64_t, void *);
-void bfd_putl64 (bfd_uint64_t, void *);
+void bfd_putb64 (uint64_t, void *);
+void bfd_putl64 (uint64_t, void *);
void bfd_putb32 (bfd_vma, void *);
void bfd_putl32 (bfd_vma, void *);
void bfd_putb24 (bfd_vma, void *);
@@ -477,8 +477,8 @@ void bfd_putl16 (bfd_vma, void *);
/* Byte swapping routines which take size and endiannes as arguments. */
-bfd_uint64_t bfd_get_bits (const void *, int, bool);
-void bfd_put_bits (bfd_uint64_t, void *, int, bool);
+uint64_t bfd_get_bits (const void *, int, bool);
+void bfd_put_bits (uint64_t, void *, int, bool);
/* mmap hacks */
@@ -7416,9 +7416,9 @@ typedef struct bfd_target
/* Entries for byte swapping for data. These are different from the
other entry points, since they don't take a BFD as the first argument.
Certain other handlers could do the same. */
- bfd_uint64_t (*bfd_getx64) (const void *);
- bfd_int64_t (*bfd_getx_signed_64) (const void *);
- void (*bfd_putx64) (bfd_uint64_t, void *);
+ uint64_t (*bfd_getx64) (const void *);
+ int64_t (*bfd_getx_signed_64) (const void *);
+ void (*bfd_putx64) (uint64_t, void *);
bfd_vma (*bfd_getx32) (const void *);
bfd_signed_vma (*bfd_getx_signed_32) (const void *);
void (*bfd_putx32) (bfd_vma, void *);
@@ -7427,9 +7427,9 @@ typedef struct bfd_target
void (*bfd_putx16) (bfd_vma, void *);
/* Byte swapping for the headers. */
- bfd_uint64_t (*bfd_h_getx64) (const void *);
- bfd_int64_t (*bfd_h_getx_signed_64) (const void *);
- void (*bfd_h_putx64) (bfd_uint64_t, void *);
+ uint64_t (*bfd_h_getx64) (const void *);
+ int64_t (*bfd_h_getx_signed_64) (const void *);
+ void (*bfd_h_putx64) (uint64_t, void *);
bfd_vma (*bfd_h_getx32) (const void *);
bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
void (*bfd_h_putx32) (bfd_vma, void *);
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index 8819187..48ce5c0 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -1890,18 +1890,12 @@ xcoff_write_armap_old (bfd *abfd, unsigned int elength ATTRIBUTE_UNUSED,
}
static char buff20[XCOFFARMAGBIG_ELEMENT_SIZE + 1];
-#if BFD_HOST_64BIT_LONG
-#define FMT20 "%-20ld"
-#elif defined (__MSVCRT__)
-#define FMT20 "%-20I64d"
-#else
-#define FMT20 "%-20lld"
-#endif
+#define FMT20 "%-20" PRId64
#define FMT12 "%-12d"
#define FMT12_OCTAL "%-12o"
#define FMT4 "%-4d"
#define PRINT20(d, v) \
- sprintf (buff20, FMT20, (bfd_uint64_t)(v)), \
+ sprintf (buff20, FMT20, (uint64_t) (v)), \
memcpy ((void *) (d), buff20, 20)
#define PRINT12(d, v) \
diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
index e8e16d3..cf339c9 100644
--- a/bfd/coff-x86_64.c
+++ b/bfd/coff-x86_64.c
@@ -201,7 +201,7 @@ coff_amd64_reloc (bfd *abfd,
case 4:
{
- bfd_uint64_t x = bfd_get_64 (abfd, addr);
+ uint64_t x = bfd_get_64 (abfd, addr);
DOIT (x);
bfd_put_64 (abfd, x, addr);
}
diff --git a/bfd/cpu-ia64-opc.c b/bfd/cpu-ia64-opc.c
index e2b5c26..01e3c3f 100644
--- a/bfd/cpu-ia64-opc.c
+++ b/bfd/cpu-ia64-opc.c
@@ -99,14 +99,14 @@ ins_immu (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
static const char*
ext_immu (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
{
- BFD_HOST_U_64_BIT value = 0;
+ uint64_t value = 0;
int i, bits = 0, total = 0;
for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
{
bits = self->field[i].bits;
value |= ((code >> self->field[i].shift)
- & ((((BFD_HOST_U_64_BIT) 1) << bits) - 1)) << total;
+ & (((uint64_t) 1 << bits) - 1)) << total;
total += bits;
}
*valuep = value;
@@ -161,7 +161,7 @@ static const char*
ins_imms_scaled (const struct ia64_operand *self, ia64_insn value,
ia64_insn *code, int scale)
{
- BFD_HOST_64_BIT svalue = value, sign_bit = 0;
+ int64_t svalue = value, sign_bit = 0;
ia64_insn new_insn = 0;
int i;
@@ -186,17 +186,17 @@ ext_imms_scaled (const struct ia64_operand *self, ia64_insn code,
ia64_insn *valuep, int scale)
{
int i, bits = 0, total = 0;
- BFD_HOST_U_64_BIT val = 0, sign;
+ uint64_t val = 0, sign;
for (i = 0; i < NELEMS (self->field) && self->field[i].bits; ++i)
{
bits = self->field[i].bits;
val |= ((code >> self->field[i].shift)
- & ((((BFD_HOST_U_64_BIT) 1) << bits) - 1)) << total;
+ & (((uint64_t) 1 << bits) - 1)) << total;
total += bits;
}
/* sign extend: */
- sign = (BFD_HOST_U_64_BIT) 1 << (total - 1);
+ sign = (uint64_t) 1 << (total - 1);
val = (val ^ sign) - sign;
*valuep = val << scale;
@@ -312,7 +312,7 @@ static const char*
ins_cnt (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
{
--value;
- if (value >= ((BFD_HOST_U_64_BIT) 1) << self->field[0].bits)
+ if (value >= (uint64_t) 1 << self->field[0].bits)
return "count out of range";
*code |= value << self->field[0].shift;
@@ -323,7 +323,7 @@ static const char*
ext_cnt (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
{
*valuep = ((code >> self->field[0].shift)
- & ((((BFD_HOST_U_64_BIT) 1) << self->field[0].bits) - 1)) + 1;
+ & (((uint64_t) 1 << self->field[0].bits) - 1)) + 1;
return 0;
}
@@ -421,8 +421,8 @@ ext_strd5b (const struct ia64_operand *self, ia64_insn code,
static const char*
ins_inc3 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
{
- BFD_HOST_64_BIT val = value;
- BFD_HOST_U_64_BIT sign = 0;
+ int64_t val = value;
+ uint64_t sign = 0;
if (val < 0)
{
@@ -444,7 +444,7 @@ ins_inc3 (const struct ia64_operand *self, ia64_insn value, ia64_insn *code)
static const char*
ext_inc3 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
{
- BFD_HOST_64_BIT val;
+ int64_t val;
int negate;
val = (code >> self->field[0].shift) & 0x7;
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 45e2867..6a728fc 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -63,8 +63,8 @@ struct attribute
{
char *str;
struct dwarf_block *blk;
- bfd_uint64_t val;
- bfd_int64_t sval;
+ uint64_t val;
+ int64_t sval;
}
u;
};
@@ -632,12 +632,12 @@ lookup_info_hash_table (struct info_hash_table *hash_table, const char *key)
the located section does not contain at least OFFSET bytes. */
static bool
-read_section (bfd * abfd,
+read_section (bfd *abfd,
const struct dwarf_debug_section *sec,
- asymbol ** syms,
- bfd_uint64_t offset,
- bfd_byte ** section_buffer,
- bfd_size_type * section_size)
+ asymbol **syms,
+ uint64_t offset,
+ bfd_byte **section_buffer,
+ bfd_size_type *section_size)
{
const char *section_name = sec->uncompressed_name;
bfd_byte *contents = *section_buffer;
@@ -848,7 +848,7 @@ read_indirect_string (struct comp_unit *unit,
bfd_byte **ptr,
bfd_byte *buf_end)
{
- bfd_uint64_t offset;
+ uint64_t offset;
struct dwarf2_debug *stash = unit->stash;
struct dwarf2_debug_file *file = unit->file;
char *str;
@@ -882,7 +882,7 @@ read_indirect_line_string (struct comp_unit *unit,
bfd_byte **ptr,
bfd_byte *buf_end)
{
- bfd_uint64_t offset;
+ uint64_t offset;
struct dwarf2_debug *stash = unit->stash;
struct dwarf2_debug_file *file = unit->file;
char *str;
@@ -919,7 +919,7 @@ read_alt_indirect_string (struct comp_unit *unit,
bfd_byte **ptr,
bfd_byte *buf_end)
{
- bfd_uint64_t offset;
+ uint64_t offset;
struct dwarf2_debug *stash = unit->stash;
char *str;
@@ -975,8 +975,7 @@ read_alt_indirect_string (struct comp_unit *unit,
or NULL upon failure. */
static bfd_byte *
-read_alt_indirect_ref (struct comp_unit * unit,
- bfd_uint64_t offset)
+read_alt_indirect_ref (struct comp_unit *unit, uint64_t offset)
{
struct dwarf2_debug *stash = unit->stash;
@@ -1012,7 +1011,7 @@ read_alt_indirect_ref (struct comp_unit * unit,
return stash->alt.dwarf_info_buffer + offset;
}
-static bfd_uint64_t
+static uint64_t
read_address (struct comp_unit *unit, bfd_byte **ptr, bfd_byte *buf_end)
{
bfd_byte *buf = *ptr;
@@ -1131,7 +1130,7 @@ del_abbrev (void *p)
in a hash table. */
static struct abbrev_info**
-read_abbrevs (bfd *abfd, bfd_uint64_t offset, struct dwarf2_debug *stash,
+read_abbrevs (bfd *abfd, uint64_t offset, struct dwarf2_debug *stash,
struct dwarf2_debug_file *file)
{
struct abbrev_info **abbrevs;
@@ -1356,8 +1355,7 @@ is_addrx_form (enum dwarf_form form)
/* Returns the address in .debug_addr section using DW_AT_addr_base.
Used to implement DW_FORM_addrx*. */
static bfd_vma
-read_indexed_address (bfd_uint64_t idx,
- struct comp_unit *unit)
+read_indexed_address (uint64_t idx, struct comp_unit *unit)
{
struct dwarf2_debug *stash = unit->stash;
struct dwarf2_debug_file *file = unit->file;
@@ -1383,8 +1381,7 @@ read_indexed_address (bfd_uint64_t idx,
/* Returns the string using DW_AT_str_offsets_base.
Used to implement DW_FORM_strx*. */
static const char *
-read_indexed_string (bfd_uint64_t idx,
- struct comp_unit *unit)
+read_indexed_string (uint64_t idx, struct comp_unit *unit)
{
struct dwarf2_debug *stash = unit->stash;
struct dwarf2_debug_file *file = unit->file;
@@ -1717,39 +1714,39 @@ struct line_info_table
struct funcinfo
{
/* Pointer to previous function in list of all functions. */
- struct funcinfo * prev_func;
+ struct funcinfo *prev_func;
/* Pointer to function one scope higher. */
- struct funcinfo * caller_func;
+ struct funcinfo *caller_func;
/* Source location file name where caller_func inlines this func. */
- char * caller_file;
+ char *caller_file;
/* Source location file name. */
- char * file;
+ char *file;
/* Source location line number where caller_func inlines this func. */
- int caller_line;
+ int caller_line;
/* Source location line number. */
- int line;
- int tag;
- bool is_linkage;
- const char * name;
- struct arange arange;
+ int line;
+ int tag;
+ bool is_linkage;
+ const char *name;
+ struct arange arange;
/* Where the symbol is defined. */
- asection * sec;
+ asection *sec;
/* The offset of the funcinfo from the start of the unit. */
- bfd_uint64_t unit_offset;
+ uint64_t unit_offset;
};
struct lookup_funcinfo
{
/* Function information corresponding to this lookup table entry. */
- struct funcinfo * funcinfo;
+ struct funcinfo *funcinfo;
/* The lowest address for this specific function. */
- bfd_vma low_addr;
+ bfd_vma low_addr;
/* The highest address of this function before the lookup table is sorted.
The highest address of all prior functions after the lookup table is
sorted, which is used for binary search. */
- bfd_vma high_addr;
+ bfd_vma high_addr;
/* Index of this function, used to ensure qsort is stable. */
unsigned int idx;
};
@@ -1759,7 +1756,7 @@ struct varinfo
/* Pointer to previous variable in list of all variables. */
struct varinfo *prev_var;
/* The offset of the varinfo from the start of the unit. */
- bfd_uint64_t unit_offset;
+ uint64_t unit_offset;
/* Source location file name. */
char *file;
/* Source location line number. */
@@ -3335,7 +3332,7 @@ find_abstract_instance (struct comp_unit *unit,
bfd_byte *info_ptr_end;
unsigned int abbrev_number, i;
struct abbrev_info *abbrev;
- bfd_uint64_t die_ref = attr_ptr->u.val;
+ uint64_t die_ref = attr_ptr->u.val;
struct attribute attr;
const char *name = NULL;
@@ -3549,7 +3546,7 @@ find_abstract_instance (struct comp_unit *unit,
static bool
read_ranges (struct comp_unit *unit, struct arange *arange,
- struct trie_node **trie_root, bfd_uint64_t offset)
+ struct trie_node **trie_root, uint64_t offset)
{
bfd_byte *ranges_ptr;
bfd_byte *ranges_end;
@@ -3594,7 +3591,7 @@ read_ranges (struct comp_unit *unit, struct arange *arange,
static bool
read_rnglists (struct comp_unit *unit, struct arange *arange,
- struct trie_node **trie_root, bfd_uint64_t offset)
+ struct trie_node **trie_root, uint64_t offset)
{
bfd_byte *rngs_ptr;
bfd_byte *rngs_end;
@@ -3675,7 +3672,7 @@ read_rnglists (struct comp_unit *unit, struct arange *arange,
static bool
read_rangelist (struct comp_unit *unit, struct arange *arange,
- struct trie_node **trie_root, bfd_uint64_t offset)
+ struct trie_node **trie_root, uint64_t offset)
{
if (unit->version <= 4)
return read_ranges (unit, arange, trie_root, offset);
@@ -3684,7 +3681,7 @@ read_rangelist (struct comp_unit *unit, struct arange *arange,
}
static struct funcinfo *
-lookup_func_by_offset (bfd_uint64_t offset, struct funcinfo * table)
+lookup_func_by_offset (uint64_t offset, struct funcinfo * table)
{
for (; table != NULL; table = table->prev_func)
if (table->unit_offset == offset)
@@ -3693,7 +3690,7 @@ lookup_func_by_offset (bfd_uint64_t offset, struct funcinfo * table)
}
static struct varinfo *
-lookup_var_by_offset (bfd_uint64_t offset, struct varinfo * table)
+lookup_var_by_offset (uint64_t offset, struct varinfo * table)
{
while (table)
{
@@ -3775,7 +3772,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
struct abbrev_info *abbrev;
struct funcinfo *func;
struct varinfo *var;
- bfd_uint64_t current_offset;
+ uint64_t current_offset;
/* PR 17512: file: 9f405d9d. */
if (info_ptr >= info_ptr_end)
@@ -3909,7 +3906,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
bfd_vma low_pc = 0;
bfd_vma high_pc = 0;
bool high_pc_relative = false;
- bfd_uint64_t current_offset;
+ uint64_t current_offset;
/* PR 17512: file: 9f405d9d. */
if (info_ptr >= info_ptr_end)
@@ -4259,7 +4256,7 @@ parse_comp_unit (struct dwarf2_debug *stash,
{
struct comp_unit* unit;
unsigned int version;
- bfd_uint64_t abbrev_offset = 0;
+ uint64_t abbrev_offset = 0;
/* Initialize it just to avoid a GCC false warning. */
unsigned int addr_size = -1;
struct abbrev_info** abbrevs;
diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index c868707..5bc78d5 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -230,14 +230,14 @@ static bfd_vma
score3_bfd_getl48 (const void *p)
{
const bfd_byte *addr = p;
- bfd_uint64_t v;
-
- v = (bfd_uint64_t) addr[4];
- v |= (bfd_uint64_t) addr[5] << 8;
- v |= (bfd_uint64_t) addr[2] << 16;
- v |= (bfd_uint64_t) addr[3] << 24;
- v |= (bfd_uint64_t) addr[0] << 32;
- v |= (bfd_uint64_t) addr[1] << 40;
+ uint64_t v;
+
+ v = (uint64_t) addr[4];
+ v |= (uint64_t) addr[5] << 8;
+ v |= (uint64_t) addr[2] << 16;
+ v |= (uint64_t) addr[3] << 24;
+ v |= (uint64_t) addr[0] << 32;
+ v |= (uint64_t) addr[1] << 40;
return v;
}
diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 59cc6b6..4d8f985 100644
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -179,7 +179,7 @@ struct elf64_ia64_vms_obj_tdata
struct elf_obj_tdata root;
/* Ident for shared library. */
- bfd_uint64_t ident;
+ uint64_t ident;
/* Used only during link: offset in the .fixups section for this bfd. */
bfd_vma fixups_off;
@@ -2791,7 +2791,7 @@ elf64_ia64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
if (!_bfd_elf_add_dynamic_entry (info, DT_IA_64_VMS_IDENT, 0))
return false;
if (!_bfd_elf_add_dynamic_entry (info, DT_IA_64_VMS_LINKTIME,
- (((bfd_uint64_t)time_hi) << 32)
+ ((uint64_t) time_hi << 32)
+ time_lo))
return false;
@@ -4720,7 +4720,7 @@ elf64_vms_close_and_cleanup (bfd *abfd)
if ((isize & 7) != 0)
{
int ishort = 8 - (isize & 7);
- bfd_uint64_t pad = 0;
+ uint64_t pad = 0;
bfd_seek (abfd, isize, SEEK_SET);
bfd_bwrite (&pad, ishort, abfd);
@@ -4853,7 +4853,7 @@ elf64_vms_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
bed->s->swap_dyn_in (abfd, extdyn, &dyn);
if (dyn.d_tag == DT_IA_64_VMS_IDENT)
{
- bfd_uint64_t tagv = dyn.d_un.d_val;
+ uint64_t tagv = dyn.d_un.d_val;
elf_ia64_vms_ident (abfd) = tagv;
break;
}
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 96eb36a..fc3a335 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -6354,15 +6354,11 @@ compute_bucket_count (struct bfd_link_info *info ATTRIBUTE_UNUSED,
size_t best_size = 0;
unsigned long int i;
- /* We have a problem here. The following code to optimize the table
- size requires an integer type with more the 32 bits. If
- BFD_HOST_U_64_BIT is set we know about such a type. */
-#ifdef BFD_HOST_U_64_BIT
if (info->optimize)
{
size_t minsize;
size_t maxsize;
- BFD_HOST_U_64_BIT best_chlen = ~((BFD_HOST_U_64_BIT) 0);
+ uint64_t best_chlen = ~((uint64_t) 0);
bfd *dynobj = elf_hash_table (info)->dynobj;
size_t dynsymcount = elf_hash_table (info)->dynsymcount;
const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
@@ -6399,7 +6395,7 @@ compute_bucket_count (struct bfd_link_info *info ATTRIBUTE_UNUSED,
for (i = minsize; i < maxsize; ++i)
{
/* Walk through the array of hashcodes and count the collisions. */
- BFD_HOST_U_64_BIT max;
+ uint64_t max;
unsigned long int j;
unsigned long int fact;
@@ -6464,11 +6460,7 @@ compute_bucket_count (struct bfd_link_info *info ATTRIBUTE_UNUSED,
free (counts);
}
else
-#endif /* defined (BFD_HOST_U_64_BIT) */
{
- /* This is the fallback solution if no 64bit type is available or if we
- are not supposed to spend much time on optimizations. We select the
- bucket count using a fixed set of numbers. */
for (i = 0; elf_buckets[i] != 0; i++)
{
best_size = elf_buckets[i];
@@ -9354,7 +9346,6 @@ ext32b_r_offset (const void *p)
return aval;
}
-#ifdef BFD_HOST_64_BIT
static bfd_vma
ext64l_r_offset (const void *p)
{
@@ -9398,7 +9389,6 @@ ext64b_r_offset (const void *p)
| (uint64_t) a->c[7]);
return aval;
}
-#endif
/* When performing a relocatable link, the input relocations are
preserved. But, if they reference global symbols, the indices
@@ -9502,13 +9492,11 @@ elf_link_adjust_relocs (bfd *abfd,
}
else
{
-#ifdef BFD_HOST_64_BIT
if (abfd->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
ext_r_off = ext64l_r_offset;
else if (abfd->xvec->header_byteorder == BFD_ENDIAN_BIG)
ext_r_off = ext64b_r_offset;
else
-#endif
abort ();
}
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index c126adf..a108324 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -555,11 +555,7 @@ ia64_elf_install_value (bfd_byte *hit_addr, bfd_vma v, unsigned int r_type)
enum ia64_opnd opnd;
const char *err;
size_t size = 8;
-#ifdef BFD_HOST_U_64_BIT
- BFD_HOST_U_64_BIT val = (BFD_HOST_U_64_BIT) v;
-#else
- bfd_vma val = v;
-#endif
+ uint64_t val = v;
opnd = IA64_OPND_NIL;
switch (r_type)
diff --git a/bfd/hppabsd-core.c b/bfd/hppabsd-core.c
index acfa5f6..d87af95 100644
--- a/bfd/hppabsd-core.c
+++ b/bfd/hppabsd-core.c
@@ -213,9 +213,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_hppabsd_vec =
{
diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
index 4f03b84..654532c 100644
--- a/bfd/hpux-core.c
+++ b/bfd/hpux-core.c
@@ -362,9 +362,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_hpux_vec =
{
diff --git a/bfd/irix-core.c b/bfd/irix-core.c
index 694fe2e..b12aef9 100644
--- a/bfd/irix-core.c
+++ b/bfd/irix-core.c
@@ -275,9 +275,9 @@ swap_abort(void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_irix_vec =
{
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 2781671..d33f341 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -617,7 +617,7 @@ DESCRIPTION
#define COERCE16(x) (((bfd_vma) (x) ^ 0x8000) - 0x8000)
#define COERCE32(x) (((bfd_vma) (x) ^ 0x80000000) - 0x80000000)
#define COERCE64(x) \
- (((bfd_uint64_t) (x) ^ ((bfd_uint64_t) 1 << 63)) - ((bfd_uint64_t) 1 << 63))
+ (((uint64_t) (x) ^ ((uint64_t) 1 << 63)) - ((uint64_t) 1 << 63))
bfd_vma
bfd_getb16 (const void *p)
@@ -757,12 +757,11 @@ bfd_getl_signed_32 (const void *p)
return COERCE32 (v);
}
-bfd_uint64_t
-bfd_getb64 (const void *p ATTRIBUTE_UNUSED)
+uint64_t
+bfd_getb64 (const void *p)
{
-#ifdef BFD_HOST_64_BIT
const bfd_byte *addr = (const bfd_byte *) p;
- bfd_uint64_t v;
+ uint64_t v;
v = addr[0]; v <<= 8;
v |= addr[1]; v <<= 8;
@@ -774,18 +773,13 @@ bfd_getb64 (const void *p ATTRIBUTE_UNUSED)
v |= addr[7];
return v;
-#else
- BFD_FAIL();
- return 0;
-#endif
}
-bfd_uint64_t
-bfd_getl64 (const void *p ATTRIBUTE_UNUSED)
+uint64_t
+bfd_getl64 (const void *p)
{
-#ifdef BFD_HOST_64_BIT
const bfd_byte *addr = (const bfd_byte *) p;
- bfd_uint64_t v;
+ uint64_t v;
v = addr[7]; v <<= 8;
v |= addr[6]; v <<= 8;
@@ -797,19 +791,13 @@ bfd_getl64 (const void *p ATTRIBUTE_UNUSED)
v |= addr[0];
return v;
-#else
- BFD_FAIL();
- return 0;
-#endif
-
}
-bfd_int64_t
-bfd_getb_signed_64 (const void *p ATTRIBUTE_UNUSED)
+int64_t
+bfd_getb_signed_64 (const void *p)
{
-#ifdef BFD_HOST_64_BIT
const bfd_byte *addr = (const bfd_byte *) p;
- bfd_uint64_t v;
+ uint64_t v;
v = addr[0]; v <<= 8;
v |= addr[1]; v <<= 8;
@@ -821,18 +809,13 @@ bfd_getb_signed_64 (const void *p ATTRIBUTE_UNUSED)
v |= addr[7];
return COERCE64 (v);
-#else
- BFD_FAIL();
- return 0;
-#endif
}
-bfd_int64_t
-bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
+int64_t
+bfd_getl_signed_64 (const void *p)
{
-#ifdef BFD_HOST_64_BIT
const bfd_byte *addr = (const bfd_byte *) p;
- bfd_uint64_t v;
+ uint64_t v;
v = addr[7]; v <<= 8;
v |= addr[6]; v <<= 8;
@@ -844,10 +827,6 @@ bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
v |= addr[0];
return COERCE64 (v);
-#else
- BFD_FAIL();
- return 0;
-#endif
}
void
@@ -871,9 +850,8 @@ bfd_putl32 (bfd_vma data, void *p)
}
void
-bfd_putb64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
+bfd_putb64 (uint64_t data, void *p)
{
-#ifdef BFD_HOST_64_BIT
bfd_byte *addr = (bfd_byte *) p;
addr[0] = (data >> (7*8)) & 0xff;
addr[1] = (data >> (6*8)) & 0xff;
@@ -883,15 +861,11 @@ bfd_putb64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
addr[5] = (data >> (2*8)) & 0xff;
addr[6] = (data >> (1*8)) & 0xff;
addr[7] = (data >> (0*8)) & 0xff;
-#else
- BFD_FAIL();
-#endif
}
void
-bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
+bfd_putl64 (uint64_t data, void *p)
{
-#ifdef BFD_HOST_64_BIT
bfd_byte *addr = (bfd_byte *) p;
addr[7] = (data >> (7*8)) & 0xff;
addr[6] = (data >> (6*8)) & 0xff;
@@ -901,13 +875,10 @@ bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
addr[2] = (data >> (2*8)) & 0xff;
addr[1] = (data >> (1*8)) & 0xff;
addr[0] = (data >> (0*8)) & 0xff;
-#else
- BFD_FAIL();
-#endif
}
void
-bfd_put_bits (bfd_uint64_t data, void *p, int bits, bool big_p)
+bfd_put_bits (uint64_t data, void *p, int bits, bool big_p)
{
bfd_byte *addr = (bfd_byte *) p;
int i;
@@ -926,11 +897,11 @@ bfd_put_bits (bfd_uint64_t data, void *p, int bits, bool big_p)
}
}
-bfd_uint64_t
+uint64_t
bfd_get_bits (const void *p, int bits, bool big_p)
{
const bfd_byte *addr = (const bfd_byte *) p;
- bfd_uint64_t data;
+ uint64_t data;
int i;
int bytes;
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index e32b787..9f3f1f1 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -4773,7 +4773,7 @@ bfd_mach_o_read_source_version (bfd *abfd, bfd_mach_o_load_command *command)
{
bfd_mach_o_source_version_command *cmd = &command->command.source_version;
struct mach_o_source_version_command_external raw;
- bfd_uint64_t ver;
+ uint64_t ver;
if (command->len < sizeof (raw) + 8)
return false;
diff --git a/bfd/mach-o.h b/bfd/mach-o.h
index 5a068d8..f7418ad 100644
--- a/bfd/mach-o.h
+++ b/bfd/mach-o.h
@@ -545,8 +545,8 @@ bfd_mach_o_encryption_info_command;
typedef struct bfd_mach_o_main_command
{
- bfd_uint64_t entryoff;
- bfd_uint64_t stacksize;
+ uint64_t entryoff;
+ uint64_t stacksize;
}
bfd_mach_o_main_command;
@@ -563,8 +563,8 @@ bfd_mach_o_source_version_command;
typedef struct bfd_mach_o_note_command
{
char data_owner[16];
- bfd_uint64_t offset;
- bfd_uint64_t size;
+ uint64_t offset;
+ uint64_t size;
}
bfd_mach_o_note_command;
diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index cb21593..ffc8e50 100644
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -257,9 +257,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_netbsd_vec =
{
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index 09a04a0..04434b2 100644
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -169,9 +169,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_osf_vec =
{
diff --git a/bfd/ptrace-core.c b/bfd/ptrace-core.c
index 3d077d2..c4afffb 100644
--- a/bfd/ptrace-core.c
+++ b/bfd/ptrace-core.c
@@ -160,9 +160,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_ptrace_vec =
{
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
index d1f80c9..7807ac8 100644
--- a/bfd/sco5-core.c
+++ b/bfd/sco5-core.c
@@ -340,9 +340,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_sco5_vec =
{
diff --git a/bfd/targets.c b/bfd/targets.c
index 05dd823..f44b5c6 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -226,9 +226,9 @@ DESCRIPTION
. {* Entries for byte swapping for data. These are different from the
. other entry points, since they don't take a BFD as the first argument.
. Certain other handlers could do the same. *}
-. bfd_uint64_t (*bfd_getx64) (const void *);
-. bfd_int64_t (*bfd_getx_signed_64) (const void *);
-. void (*bfd_putx64) (bfd_uint64_t, void *);
+. uint64_t (*bfd_getx64) (const void *);
+. int64_t (*bfd_getx_signed_64) (const void *);
+. void (*bfd_putx64) (uint64_t, void *);
. bfd_vma (*bfd_getx32) (const void *);
. bfd_signed_vma (*bfd_getx_signed_32) (const void *);
. void (*bfd_putx32) (bfd_vma, void *);
@@ -237,9 +237,9 @@ DESCRIPTION
. void (*bfd_putx16) (bfd_vma, void *);
.
. {* Byte swapping for the headers. *}
-. bfd_uint64_t (*bfd_h_getx64) (const void *);
-. bfd_int64_t (*bfd_h_getx_signed_64) (const void *);
-. void (*bfd_h_putx64) (bfd_uint64_t, void *);
+. uint64_t (*bfd_h_getx64) (const void *);
+. int64_t (*bfd_h_getx_signed_64) (const void *);
+. void (*bfd_h_putx64) (uint64_t, void *);
. bfd_vma (*bfd_h_getx32) (const void *);
. bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
. void (*bfd_h_putx32) (bfd_vma, void *);
diff --git a/bfd/trad-core.c b/bfd/trad-core.c
index 92a279b..8e9ee0d 100644
--- a/bfd/trad-core.c
+++ b/bfd/trad-core.c
@@ -249,9 +249,9 @@ swap_abort (void)
#define NO_GET ((bfd_vma (*) (const void *)) swap_abort)
#define NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
#define NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
-#define NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
-#define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
-#define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
+#define NO_GET64 ((uint64_t (*) (const void *)) swap_abort)
+#define NO_PUT64 ((void (*) (uint64_t, void *)) swap_abort)
+#define NO_GETS64 ((int64_t (*) (const void *)) swap_abort)
const bfd_target core_trad_vec =
{
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index 1129c98..fd07628 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -522,7 +522,7 @@ _bfd_vms_slurp_eisd (bfd *abfd, unsigned int offset)
struct vms_eisd *eisd;
unsigned int rec_size;
unsigned int size;
- bfd_uint64_t vaddr;
+ uint64_t vaddr;
unsigned int flags;
unsigned int vbn;
char *name = NULL;
generated by cgit v1.1 at 2024-07-12 05:27:22 +0000