From 1a101a422077cc4ebe1c0abb2f87e44cef3151e4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 4 Dec 2003 12:08:42 +0000 Subject: [PATCH] * coff-i860.c (coff_i860_reloc_nyi): Return bfd_reloc_not_supported. * elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Warning fixes. (mn10300_elf_relax_section): Likewise. * nlm32-alpha.c (ONES): Define. (nlm32_alpha_howto_table): Use it to avoid warnings. --- bfd/ChangeLog | 8 ++++++++ bfd/coff-i860.c | 1 + bfd/elf-m10300.c | 35 +++++++++++++++++++++-------------- bfd/nlm32-alpha.c | 12 +++++++----- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 95097af0192..a62052f8f6b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2003-12-04 Alan Modra + + * coff-i860.c (coff_i860_reloc_nyi): Return bfd_reloc_not_supported. + * elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Warning fixes. + (mn10300_elf_relax_section): Likewise. + * nlm32-alpha.c (ONES): Define. + (nlm32_alpha_howto_table): Use it to avoid warnings. + 2003-12-04 Alan Modra * elf32-i386.c (elf_i386_object_p): Delete. diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c index db77a2cda49..edc9f4e6a27 100644 --- a/bfd/coff-i860.c +++ b/bfd/coff-i860.c @@ -140,6 +140,7 @@ coff_i860_reloc_nyi (bfd *abfd ATTRIBUTE_UNUSED, { reloc_howto_type *howto = reloc_entry->howto; fprintf (stderr, _("Relocation `%s' not yet implemented\n"), howto->name); + return bfd_reloc_notsupported; } #ifndef PCRELOFFSET diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index aa8fd0dd289..f628e760bd5 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -1743,10 +1743,13 @@ elf32_mn10300_finish_hash_table_entry (gen_entry, in_args) byte_count += 2; /* Count the insn to allocate stack space too. */ - if (entry->stack_size > 0 && entry->stack_size <= 128) - byte_count += 3; - else if (entry->stack_size > 0 && entry->stack_size < 256) - byte_count += 4; + if (entry->stack_size > 0) + { + if (entry->stack_size <= 128) + byte_count += 3; + else + byte_count += 4; + } /* If using "call" will result in larger code, then turn all the associated "call" instructions into "calls" instructions. */ @@ -2238,11 +2241,13 @@ mn10300_elf_relax_section (abfd, sec, link_info, again) if (sym_hash->movm_args) bytes += 2; - if (sym_hash->stack_size && sym_hash->stack_size <= 128) - bytes += 3; - else if (sym_hash->stack_size - && sym_hash->stack_size < 256) - bytes += 4; + if (sym_hash->stack_size > 0) + { + if (sym_hash->stack_size <= 128) + bytes += 3; + else + bytes += 4; + } /* Note that we've deleted prologue bytes for this function. */ @@ -2290,11 +2295,13 @@ mn10300_elf_relax_section (abfd, sec, link_info, again) if (sym_hash->movm_args) bytes += 2; - if (sym_hash->stack_size && sym_hash->stack_size <= 128) - bytes += 3; - else if (sym_hash->stack_size - && sym_hash->stack_size < 256) - bytes += 4; + if (sym_hash->stack_size > 0) + { + if (sym_hash->stack_size <= 128) + bytes += 3; + else + bytes += 4; + } /* Note that we've deleted prologue bytes for this function. */ diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c index bcaa6abaefd..990ce8d5a7a 100644 --- a/bfd/nlm32-alpha.c +++ b/bfd/nlm32-alpha.c @@ -97,6 +97,8 @@ nlm_alpha_write_prefix (abfd) return TRUE; } +#define ONES(n) (((bfd_vma) 1 << ((n) - 1) << 1) - 1) + /* How to process the various reloc types. */ static reloc_howto_type nlm32_alpha_howto_table[] = @@ -144,8 +146,8 @@ static reloc_howto_type nlm32_alpha_howto_table[] = 0, /* special_function */ "REFQUAD", /* name */ TRUE, /* partial_inplace */ - 0xffffffffffffffff, /* src_mask */ - 0xffffffffffffffff, /* dst_mask */ + ONES (64), /* src_mask */ + ONES (64), /* dst_mask */ FALSE), /* pcrel_offset */ /* A 32 bit GP relative offset. This is just like REFLONG except @@ -304,8 +306,8 @@ static reloc_howto_type nlm32_alpha_howto_table[] = 0, /* special_function */ "SREL64", /* name */ TRUE, /* partial_inplace */ - 0xffffffffffffffff, /* src_mask */ - 0xffffffffffffffff, /* dst_mask */ + ONES (64), /* src_mask */ + ONES (64), /* dst_mask */ FALSE), /* pcrel_offset */ /* Push a value on the reloc evaluation stack. */ @@ -336,7 +338,7 @@ static reloc_howto_type nlm32_alpha_howto_table[] = "OP_STORE", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ - 0xffffffffffffffff, /* dst_mask */ + ONES (64), /* dst_mask */ FALSE), /* pcrel_offset */ /* Subtract the reloc address from the value on the top of the -- 2.30.2