summaryrefslogtreecommitdiff
path: root/bfd/aoutx.h
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/aoutx.h')
-rw-r--r--bfd/aoutx.h88
1 files changed, 44 insertions, 44 deletions
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 107772dfc3..7fa334ab48 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -2261,8 +2261,8 @@ NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
/* Now the fun stuff. */
if (bfd_header_big_endian (abfd))
{
- r_index = (((unsigned int) bytes->r_index[0] << 16)
- | ((unsigned int) bytes->r_index[1] << 8)
+ r_index = ((bytes->r_index[0] << 16)
+ | (bytes->r_index[1] << 8)
| bytes->r_index[2]);
r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
r_type = ((bytes->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
@@ -2270,8 +2270,8 @@ NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
}
else
{
- r_index = (((unsigned int) bytes->r_index[2] << 16)
- | ((unsigned int) bytes->r_index[1] << 8)
+ r_index = ((bytes->r_index[2] << 16)
+ | (bytes->r_index[1] << 8)
| bytes->r_index[0]);
r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
r_type = ((bytes->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
@@ -2283,9 +2283,9 @@ NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
/* Base relative relocs are always against the symbol table,
regardless of the setting of r_extern. r_extern just reflects
whether the symbol the reloc is against is local or global. */
- if (r_type == (unsigned int) RELOC_BASE10
- || r_type == (unsigned int) RELOC_BASE13
- || r_type == (unsigned int) RELOC_BASE22)
+ if (r_type == RELOC_BASE10
+ || r_type == RELOC_BASE13
+ || r_type == RELOC_BASE22)
r_extern = 1;
if (r_extern && r_index > symcount)
@@ -2320,8 +2320,8 @@ NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
/* Now the fun stuff. */
if (bfd_header_big_endian (abfd))
{
- r_index = (((unsigned int) bytes->r_index[0] << 16)
- | ((unsigned int) bytes->r_index[1] << 8)
+ r_index = ((bytes->r_index[0] << 16)
+ | (bytes->r_index[1] << 8)
| bytes->r_index[2]);
r_extern = (0 != (bytes->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
r_pcrel = (0 != (bytes->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
@@ -2333,8 +2333,8 @@ NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
}
else
{
- r_index = (((unsigned int) bytes->r_index[2] << 16)
- | ((unsigned int) bytes->r_index[1] << 8)
+ r_index = ((bytes->r_index[2] << 16)
+ | (bytes->r_index[1] << 8)
| bytes->r_index[0]);
r_extern = (0 != (bytes->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
r_pcrel = (0 != (bytes->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
@@ -3891,7 +3891,7 @@ NAME(aout,final_link) (abfd, info, callback)
for (p = o->link_order_head; p != NULL; p = p->next)
{
if (p->type == bfd_indirect_link_order)
- p->u.indirect.section->linker_mark = (unsigned int) true;
+ p->u.indirect.section->linker_mark = true;
}
}
@@ -4440,7 +4440,7 @@ aout_link_write_symbols (finfo, input_bfd)
characters in the symbol names, not including the file
numbers in types (the first number after an open
parenthesis). */
- if (type == (int) N_BINCL)
+ if (type == N_BINCL)
{
struct external_nlist *incl_sym;
int nest;
@@ -4454,13 +4454,13 @@ aout_link_write_symbols (finfo, input_bfd)
int incl_type;
incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
- if (incl_type == (int) N_EINCL)
+ if (incl_type == N_EINCL)
{
if (nest == 0)
break;
--nest;
}
- else if (incl_type == (int) N_BINCL)
+ else if (incl_type == N_BINCL)
++nest;
else if (nest == 0)
{
@@ -4485,7 +4485,7 @@ aout_link_write_symbols (finfo, input_bfd)
/* If we have already included a header file with the
same value, then replace this one with an N_EXCL
symbol. */
- copy = (boolean) (! finfo->info->keep_memory);
+ copy = ! finfo->info->keep_memory;
incl_entry = aout_link_includes_lookup (&finfo->includes,
name, true, copy);
if (incl_entry == NULL)
@@ -4513,7 +4513,7 @@ aout_link_write_symbols (finfo, input_bfd)
/* This is a duplicate header file. We must change
it to be an N_EXCL entry, and mark all the
included symbols to prevent outputting them. */
- type = (int) N_EXCL;
+ type = N_EXCL;
nest = 0;
for (incl_sym = sym + 1, incl_map = symbol_map + 1;
@@ -4523,7 +4523,7 @@ aout_link_write_symbols (finfo, input_bfd)
int incl_type;
incl_type = H_GET_8 (input_bfd, incl_sym->e_type);
- if (incl_type == (int) N_EINCL)
+ if (incl_type == N_EINCL)
{
if (nest == 0)
{
@@ -4532,7 +4532,7 @@ aout_link_write_symbols (finfo, input_bfd)
}
--nest;
}
- else if (incl_type == (int) N_BINCL)
+ else if (incl_type == N_BINCL)
++nest;
else if (nest == 0)
*incl_map = -1;
@@ -4887,8 +4887,8 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
if (bfd_header_big_endian (input_bfd))
{
- r_index = (((unsigned int) rel->r_index[0] << 16)
- | ((unsigned int) rel->r_index[1] << 8)
+ r_index = ((rel->r_index[0] << 16)
+ | (rel->r_index[1] << 8)
| rel->r_index[2]);
r_extern = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
r_pcrel = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
@@ -4900,8 +4900,8 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
}
else
{
- r_index = (((unsigned int) rel->r_index[2] << 16)
- | ((unsigned int) rel->r_index[1] << 8)
+ r_index = ((rel->r_index[2] << 16)
+ | (rel->r_index[1] << 8)
| rel->r_index[0]);
r_extern = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
r_pcrel = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
@@ -5223,8 +5223,8 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
if (bfd_header_big_endian (input_bfd))
{
- r_index = (((unsigned int) rel->r_index[0] << 16)
- | ((unsigned int) rel->r_index[1] << 8)
+ r_index = ((rel->r_index[0] << 16)
+ | (rel->r_index[1] << 8)
| rel->r_index[2]);
r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
r_type = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
@@ -5232,8 +5232,8 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
}
else
{
- r_index = (((unsigned int) rel->r_index[2] << 16)
- | ((unsigned int) rel->r_index[1] << 8)
+ r_index = ((rel->r_index[2] << 16)
+ | (rel->r_index[1] << 8)
| rel->r_index[0]);
r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
r_type = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
@@ -5249,16 +5249,16 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
/* We are generating a relocateable output file, and must
modify the reloc accordingly. */
if (r_extern
- || r_type == (unsigned int) RELOC_BASE10
- || r_type == (unsigned int) RELOC_BASE13
- || r_type == (unsigned int) RELOC_BASE22)
+ || r_type == RELOC_BASE10
+ || r_type == RELOC_BASE13
+ || r_type == RELOC_BASE22)
{
/* If we know the symbol this relocation is against,
convert it into a relocation against a section. This
is what the native linker does. */
- if (r_type == (unsigned int) RELOC_BASE10
- || r_type == (unsigned int) RELOC_BASE13
- || r_type == (unsigned int) RELOC_BASE22)
+ if (r_type == RELOC_BASE10
+ || r_type == RELOC_BASE13
+ || r_type == RELOC_BASE22)
h = NULL;
else
h = sym_hashes[r_index];
@@ -5426,9 +5426,9 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
relocation = 0;
}
}
- else if (r_type == (unsigned int) RELOC_BASE10
- || r_type == (unsigned int) RELOC_BASE13
- || r_type == (unsigned int) RELOC_BASE22)
+ else if (r_type == RELOC_BASE10
+ || r_type == RELOC_BASE13
+ || r_type == RELOC_BASE22)
{
struct external_nlist *sym;
int type;
@@ -5510,9 +5510,9 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
to skip this reloc. */
if (hundef
&& ! finfo->info->shared
- && r_type != (unsigned int) RELOC_BASE10
- && r_type != (unsigned int) RELOC_BASE13
- && r_type != (unsigned int) RELOC_BASE22)
+ && r_type != RELOC_BASE10
+ && r_type != RELOC_BASE13
+ && r_type != RELOC_BASE22)
{
const char *name;
@@ -5526,7 +5526,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
return false;
}
- if (r_type != (unsigned int) RELOC_SPARC_REV32)
+ if (r_type != RELOC_SPARC_REV32)
r = MY_final_link_relocate (howto_table_ext + r_type,
input_bfd, input_section,
contents, r_addr, relocation,
@@ -5555,9 +5555,9 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
if (h != NULL)
name = h->root.root.string;
else if (r_extern
- || r_type == (unsigned int) RELOC_BASE10
- || r_type == (unsigned int) RELOC_BASE13
- || r_type == (unsigned int) RELOC_BASE22)
+ || r_type == RELOC_BASE10
+ || r_type == RELOC_BASE13
+ || r_type == RELOC_BASE22)
name = strings + GET_WORD (input_bfd,
syms[r_index].e_strx);
else
@@ -5673,7 +5673,7 @@ aout_link_reloc_link_order (finfo, o, p)
int r_relative;
int r_length;
- r_pcrel = (int) howto->pc_relative;
+ r_pcrel = howto->pc_relative;
r_baserel = (howto->type & 8) != 0;
r_jmptable = (howto->type & 16) != 0;
r_relative = (howto->type & 32) != 0;
View Lorry Controller Status