diff options
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/coff-i386.c | 2 | ||||
| -rw-r--r-- | bfd/coff-x86_64.c | 6 | ||||
| -rw-r--r-- | bfd/coffgen.c | 2 | ||||
| -rw-r--r-- | bfd/dwarf2.c | 2 | ||||
| -rw-r--r-- | bfd/elf-m10200.c | 2 | ||||
| -rw-r--r-- | bfd/elf.c | 208 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 37 | ||||
| -rw-r--r-- | bfd/elf32-bfin.c | 22 | ||||
| -rw-r--r-- | bfd/elf32-csky.c | 8 | ||||
| -rw-r--r-- | bfd/elf32-m32r.c | 2 | ||||
| -rw-r--r-- | bfd/elf32-microblaze.c | 8 | ||||
| -rw-r--r-- | bfd/elf32-pru.c | 2 | ||||
| -rw-r--r-- | bfd/elf32-rx.c | 5 | ||||
| -rw-r--r-- | bfd/elf32-xgate.c | 2 | ||||
| -rw-r--r-- | bfd/elf64-sparc.c | 12 | ||||
| -rw-r--r-- | bfd/elfnn-ia64.c | 2 | ||||
| -rw-r--r-- | bfd/elfxx-riscv.c | 6 | ||||
| -rw-r--r-- | bfd/elfxx-sparc.c | 6 | ||||
| -rw-r--r-- | bfd/linker.c | 2 | ||||
| -rw-r--r-- | bfd/mach-o.c | 12 | ||||
| -rw-r--r-- | bfd/pe-x86_64.c | 6 | ||||
| -rw-r--r-- | bfd/pei-x86_64.c | 6 | ||||
| -rw-r--r-- | bfd/plugin.c | 16 |
24 files changed, 197 insertions, 188 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ca5a3a1..7953c84 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2019-04-03 Alan Modra <amodra@gmail.com> + + * coff-i386.c, * coff-x86_64.c, * coffgen.c, * dwarf2.c, + * elf-m10200.c, * elf.c, * elf32-arm.c, * elf32-bfin.c, + * elf32-csky.c, * elf32-m32r.c, * elf32-microblaze.c, * elf32-pru.c, + * elf32-rx.c, * elf32-xgate.c, * elf64-sparc.c, * elfnn-ia64.c, + * elfxx-riscv.c, * elfxx-sparc.c, * linker.c, * mach-o.c, + * pe-x86_64.c, * pei-x86_64.c, * plugin.c: Whitespace fixes. + 2019-04-02 Jim Wilson <jimw@sifive.com> PR 24389 diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c index 6505664..9810fd7 100644 --- a/bfd/coff-i386.c +++ b/bfd/coff-i386.c @@ -661,7 +661,7 @@ const bfd_target bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */ /* Note that we allow an object file to be treated as a core file as well. */ - + #ifdef COFF_CHECK_FORMAT { /* bfd_check_format */ _bfd_dummy_target, diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c index b3a6cb6..c5e9a34 100644 --- a/bfd/coff-x86_64.c +++ b/bfd/coff-x86_64.c @@ -792,19 +792,19 @@ const bfd_target _bfd_dummy_target, amd64coff_object_p, bfd_generic_archive_p, - amd64coff_object_p + amd64coff_object_p }, { /* bfd_set_format. */ _bfd_bool_bfd_false_error, coff_mkobject, _bfd_generic_mkarchive, - _bfd_bool_bfd_false_error + _bfd_bool_bfd_false_error }, { /* bfd_write_contents. */ _bfd_bool_bfd_false_error, coff_write_object_contents, _bfd_write_archive_contents, - _bfd_bool_bfd_false_error + _bfd_bool_bfd_false_error }, BFD_JUMP_TABLE_GENERIC (coff), diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 139ff97..0001d9a 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -836,7 +836,7 @@ coff_mangle_symbols (bfd *bfd_ptr) for (i = 0; i < s->u.syment.n_numaux; i++) { combined_entry_type *a = s + i + 1; - + BFD_ASSERT (! a->is_sym); if (a->fix_tag) { diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index e3c6d6d..76af009 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -4300,7 +4300,7 @@ section_vma_same (const bfd *abfd, const struct dwarf2_debug *stash) stashed vma information. */ if (abfd->section_count != stash->sec_vma_count) return FALSE; - + for (i = 0, s = abfd->sections; i < abfd->section_count; i++, s = s->next) { bfd_vma vma; diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c index a1434fa..cfccb96 100644 --- a/bfd/elf-m10200.c +++ b/bfd/elf-m10200.c @@ -228,7 +228,7 @@ mn10200_info_to_howto (bfd *abfd, bfd_set_error (bfd_error_bad_value); return FALSE; } - + cache_ptr->howto = &elf_mn10200_howto_table[r_type]; return cache_ptr->howto != NULL; } @@ -9942,94 +9942,94 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note) case NT_PPC_TAR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tar (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tar (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_PPR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_ppr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_ppr (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_DSCR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_dscr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_dscr (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_EBB: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_ebb (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_ebb (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_PMU: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_pmu (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_pmu (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CGPR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_cgpr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_cgpr (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CFPR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_cfpr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_cfpr (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CVMX: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_cvmx (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_cvmx (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CVSX: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_cvsx (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_cvsx (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_SPR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_spr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_spr (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CTAR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_ctar (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_ctar (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CPPR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_cppr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_cppr (abfd, note); else - return TRUE; + return TRUE; case NT_PPC_TM_CDSCR: if (note->namesz == 6 - && strcmp (note->namedata, "LINUX") == 0) - return elfcore_grok_ppc_tm_cdscr (abfd, note); + && strcmp (note->namedata, "LINUX") == 0) + return elfcore_grok_ppc_tm_cdscr (abfd, note); else - return TRUE; + return TRUE; case NT_S390_HIGH_GPRS: if (note->namesz == 6 @@ -11147,158 +11147,158 @@ elfcore_write_ppc_vsx (bfd *abfd, char * elfcore_write_ppc_tar (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tar, - int size) + char *buf, + int *bufsiz, + const void *ppc_tar, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TAR, ppc_tar, size); + note_name, NT_PPC_TAR, ppc_tar, size); } char * elfcore_write_ppc_ppr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_ppr, - int size) + char *buf, + int *bufsiz, + const void *ppc_ppr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_PPR, ppc_ppr, size); + note_name, NT_PPC_PPR, ppc_ppr, size); } char * elfcore_write_ppc_dscr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_dscr, - int size) + char *buf, + int *bufsiz, + const void *ppc_dscr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_DSCR, ppc_dscr, size); + note_name, NT_PPC_DSCR, ppc_dscr, size); } char * elfcore_write_ppc_ebb (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_ebb, - int size) + char *buf, + int *bufsiz, + const void *ppc_ebb, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_EBB, ppc_ebb, size); + note_name, NT_PPC_EBB, ppc_ebb, size); } char * elfcore_write_ppc_pmu (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_pmu, - int size) + char *buf, + int *bufsiz, + const void *ppc_pmu, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_PMU, ppc_pmu, size); + note_name, NT_PPC_PMU, ppc_pmu, size); } char * elfcore_write_ppc_tm_cgpr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_cgpr, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_cgpr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CGPR, ppc_tm_cgpr, size); + note_name, NT_PPC_TM_CGPR, ppc_tm_cgpr, size); } char * elfcore_write_ppc_tm_cfpr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_cfpr, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_cfpr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CFPR, ppc_tm_cfpr, size); + note_name, NT_PPC_TM_CFPR, ppc_tm_cfpr, size); } char * elfcore_write_ppc_tm_cvmx (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_cvmx, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_cvmx, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CVMX, ppc_tm_cvmx, size); + note_name, NT_PPC_TM_CVMX, ppc_tm_cvmx, size); } char * elfcore_write_ppc_tm_cvsx (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_cvsx, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_cvsx, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CVSX, ppc_tm_cvsx, size); + note_name, NT_PPC_TM_CVSX, ppc_tm_cvsx, size); } char * elfcore_write_ppc_tm_spr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_spr, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_spr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_SPR, ppc_tm_spr, size); + note_name, NT_PPC_TM_SPR, ppc_tm_spr, size); } char * elfcore_write_ppc_tm_ctar (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_ctar, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_ctar, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CTAR, ppc_tm_ctar, size); + note_name, NT_PPC_TM_CTAR, ppc_tm_ctar, size); } char * elfcore_write_ppc_tm_cppr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_cppr, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_cppr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CPPR, ppc_tm_cppr, size); + note_name, NT_PPC_TM_CPPR, ppc_tm_cppr, size); } char * elfcore_write_ppc_tm_cdscr (bfd *abfd, - char *buf, - int *bufsiz, - const void *ppc_tm_cdscr, - int size) + char *buf, + int *bufsiz, + const void *ppc_tm_cdscr, + int size) { char *note_name = "LINUX"; return elfcore_write_note (abfd, buf, bufsiz, - note_name, NT_PPC_TM_CDSCR, ppc_tm_cdscr, size); + note_name, NT_PPC_TM_CDSCR, ppc_tm_cdscr, size); } static char * diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 28ee9d5..b5b2dab 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -9534,7 +9534,7 @@ elf32_arm_allocate_plt_entry (struct bfd_link_info *info, arm_plt->got_offset = sgotplt->size - 8 * htab->num_tls_desc; if (htab->fdpic_p) /* Function descriptor takes 64 bits in GOT. */ - sgotplt->size += 8; + sgotplt->size += 8; else sgotplt->size += 4; } @@ -9646,10 +9646,10 @@ elf32_arm_populate_plt_entry (bfd *output_bfd, struct bfd_link_info *info, After the reserved .got.plt entries, all symbols appear in the same order as in .plt. */ if (htab->fdpic_p) - /* Function descriptor takes 8 bytes. */ - plt_index = (got_offset - got_header_size) / 8; + /* Function descriptor takes 8 bytes. */ + plt_index = (got_offset - got_header_size) / 8; else - plt_index = (got_offset - got_header_size) / 4; + plt_index = (got_offset - got_header_size) / 4; /* Calculate the address of the GOT entry. */ got_address = (sgot->output_section->vma @@ -12620,7 +12620,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, case R_ARM_GOTOFFFUNCDESC: { - if (h == NULL) + if (h == NULL) { struct fdpic_local *local_fdpic_cnts = elf32_arm_local_fdpic_cnts(input_bfd); int dynindx = elf_section_data (sym_sec->output_section)->dynindx; @@ -12681,7 +12681,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, case R_ARM_GOTFUNCDESC: { - if (h != NULL) + if (h != NULL) { Elf_Internal_Rela outrel; @@ -12741,9 +12741,10 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, outrel.r_addend = 0; if (h->dynindx == -1 && !bfd_link_pic(info)) if (h->root.type == bfd_link_hash_undefweak) - arm_elf_add_rofixup(output_bfd, globals->srofixup, -1); + arm_elf_add_rofixup(output_bfd, globals->srofixup, -1); else - arm_elf_add_rofixup(output_bfd, globals->srofixup, outrel.r_offset); + arm_elf_add_rofixup(output_bfd, globals->srofixup, + outrel.r_offset); else elf32_arm_add_dynreloc (output_bfd, info, srelgot, &outrel); eh->fdpic_cnts.gotfuncdesc_offset |= 1; @@ -12761,7 +12762,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, case R_ARM_FUNCDESC: { - if (h == NULL) + if (h == NULL) { struct fdpic_local *local_fdpic_cnts = elf32_arm_local_fdpic_cnts(input_bfd); Elf_Internal_Rela outrel; @@ -16334,9 +16335,9 @@ allocate_dynrelocs_for_symbol (struct elf_link_hash_entry *h, void * inf) eh->fdpic_cnts.gotfuncdesc_offset = s->size; s->size += 4; if (h->dynindx == -1 && !bfd_link_pic(info)) - htab->srofixup->size += 4; + htab->srofixup->size += 4; else - elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1); + elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1); } if (eh->fdpic_cnts.funcdesc_cnt > 0) @@ -17843,15 +17844,15 @@ elf32_arm_output_plt_map_1 (output_arch_syminfo *osi, : ARM_MAP_ARM; if (elf32_arm_plt_needs_thumb_stub_p (osi->info, arm_plt)) - if (!elf32_arm_output_map_sym (osi, ARM_MAP_THUMB, addr - 4)) - return FALSE; + if (!elf32_arm_output_map_sym (osi, ARM_MAP_THUMB, addr - 4)) + return FALSE; if (!elf32_arm_output_map_sym (osi, type, addr)) - return FALSE; + return FALSE; if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 16)) - return FALSE; + return FALSE; if (htab->plt_entry_size == 4 * ARRAY_SIZE(elf32_arm_fdpic_plt_entry)) - if (!elf32_arm_output_map_sym (osi, type, addr + 24)) - return FALSE; + if (!elf32_arm_output_map_sym (osi, type, addr + 24)) + return FALSE; } else if (using_thumb_only (htab)) { @@ -20454,7 +20455,7 @@ elf32_arm_fdpic_omit_section_dynsym (bfd *output_bfd ATTRIBUTE_UNUSED, #define elf32_bed elf32_arm_fdpic_bed #undef bfd_elf32_bfd_link_hash_table_create -#define bfd_elf32_bfd_link_hash_table_create elf32_arm_fdpic_link_hash_table_create +#define bfd_elf32_bfd_link_hash_table_create elf32_arm_fdpic_link_hash_table_create #undef elf_backend_omit_section_dynsym #define elf_backend_omit_section_dynsym elf32_arm_fdpic_omit_section_dynsym diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c index ca7cfbb..2e4751f 100644 --- a/bfd/elf32-bfin.c +++ b/bfd/elf32-bfin.c @@ -142,12 +142,12 @@ bfin_pcrel24_reloc (bfd *abfd, static bfd_reloc_status_type bfin_imm16_reloc (bfd *abfd, - arelent *reloc_entry, - asymbol *symbol, - void * data, - asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) + arelent *reloc_entry, + asymbol *symbol, + void * data, + asection *input_section, + bfd *output_bfd, + char **error_message ATTRIBUTE_UNUSED) { bfd_vma relocation, x; bfd_size_type reloc_addr = reloc_entry->address; @@ -281,11 +281,11 @@ bfin_byte4_reloc (bfd *abfd, static bfd_reloc_status_type bfin_bfd_reloc (bfd *abfd, arelent *reloc_entry, - asymbol *symbol, - void * data, - asection *input_section, - bfd *output_bfd, - char **error_message ATTRIBUTE_UNUSED) + asymbol *symbol, + void * data, + asection *input_section, + bfd *output_bfd, + char **error_message ATTRIBUTE_UNUSED) { bfd_vma relocation; bfd_size_type addr = reloc_entry->address; diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c index 7179c6d..fb380b1 100644 --- a/bfd/elf32-csky.c +++ b/bfd/elf32-csky.c @@ -3098,9 +3098,9 @@ group_sections (struct csky_elf_link_hash_table *htab, continue; /* Reverse the list: we must avoid placing stubs at the - beginning of the section because the beginning of the text - section may be required for an interrupt vector in bare metal - code. */ + beginning of the section because the beginning of the text + section may be required for an interrupt vector in bare metal + code. */ #define NEXT_SEC PREV_SEC head = NULL; while (tail != NULL) @@ -4509,7 +4509,7 @@ csky_elf_relocate_section (bfd * output_bfd, { h->got.offset |= 1; if (GENERATE_RELATIVE_RELOC_P (info, h)) - relative_reloc = TRUE; + relative_reloc = TRUE; } } bfd_put_32 (output_bfd, relocation, diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 6e81313..92ed2d1 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -1310,7 +1310,7 @@ m32r_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, /* xgettext:c-format */ _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, r_type); bfd_set_error (bfd_error_bad_value); - return FALSE; + return FALSE; } diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c index e3c8027..8015465 100644 --- a/bfd/elf32-microblaze.c +++ b/bfd/elf32-microblaze.c @@ -252,7 +252,7 @@ static reloc_howto_type microblaze_elf_howto_raw[] = TRUE), /* PC relative offset? */ /* A 64 bit TEXTPCREL relocation. Table-entry not really used. */ - HOWTO (R_MICROBLAZE_TEXTPCREL_64, /* Type. */ + HOWTO (R_MICROBLAZE_TEXTPCREL_64, /* Type. */ 0, /* Rightshift. */ 2, /* Size (0 = byte, 1 = short, 2 = long). */ 16, /* Bitsize. */ @@ -260,11 +260,11 @@ static reloc_howto_type microblaze_elf_howto_raw[] = 0, /* Bitpos. */ complain_overflow_dont, /* Complain on overflow. */ bfd_elf_generic_reloc, /* Special Function. */ - "R_MICROBLAZE_TEXTPCREL_64", /* Name. */ + "R_MICROBLAZE_TEXTPCREL_64", /* Name. */ FALSE, /* Partial Inplace. */ 0, /* Source Mask. */ 0x0000ffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ + TRUE), /* PC relative offset? */ /* A 64 bit GOT relocation. Table-entry not really used. */ HOWTO (R_MICROBLAZE_GOT_64, /* Type. */ @@ -294,7 +294,7 @@ static reloc_howto_type microblaze_elf_howto_raw[] = FALSE, /* Partial Inplace. */ 0, /* Source Mask. */ 0x0000ffff, /* Dest Mask. */ - FALSE), /* PC relative offset? */ + FALSE), /* PC relative offset? */ /* A 64 bit PLT relocation. Table-entry not really used. */ HOWTO (R_MICROBLAZE_PLT_64, /* Type. */ diff --git a/bfd/elf32-pru.c b/bfd/elf32-pru.c index bfc3457..d9be74f 100644 --- a/bfd/elf32-pru.c +++ b/bfd/elf32-pru.c @@ -421,7 +421,7 @@ pru_elf32_info_to_howto (bfd *abfd, arelent *cache_ptr, bfd_set_error (bfd_error_bad_value); return FALSE; } - + cache_ptr->howto = lookup_howto (r_type); return cache_ptr->howto != NULL; } diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c index 0b5f983..e130784 100644 --- a/bfd/elf32-rx.c +++ b/bfd/elf32-rx.c @@ -3318,8 +3318,7 @@ rx_elf_object_p (bfd * abfd) static bfd_boolean rx_linux_object_p (bfd * abfd) { - bfd_default_set_arch_mach (abfd, bfd_arch_rx, - elf32_rx_machine (abfd)); + bfd_default_set_arch_mach (abfd, bfd_arch_rx, elf32_rx_machine (abfd)); return TRUE; } @@ -4083,6 +4082,6 @@ rx_additional_link_map_text (bfd *obfd, struct bfd_link_info *info, FILE *mapfil #define elf_backend_object_p rx_linux_object_p #undef elf_symbol_leading_char #undef elf32_bed -#define elf32_bed elf32_rx_le_linux_bed +#define elf32_bed elf32_rx_le_linux_bed #include "elf32-target.h" diff --git a/bfd/elf32-xgate.c b/bfd/elf32-xgate.c index bd02437..b35085f 100644 --- a/bfd/elf32-xgate.c +++ b/bfd/elf32-xgate.c @@ -385,7 +385,7 @@ bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, for (i = 0; i < ARRAY_SIZE (xgate_reloc_map); i++) if (xgate_reloc_map[i].bfd_reloc_val == code) return &elf_xgate_howto_table[xgate_reloc_map[i].elf_reloc_val]; - + return NULL; } diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index 55a1db9..50b051a 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -116,17 +116,17 @@ elf64_sparc_slurp_one_reloc_table (bfd *abfd, asection *asect, if (ELF64_R_SYM (rela.r_info) == STN_UNDEF) relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; else if (/* PR 17512: file: 996185f8. */ - (!dynamic && ELF64_R_SYM(rela.r_info) > bfd_get_symcount(abfd)) - || (dynamic - && ELF64_R_SYM(rela.r_info) > bfd_get_dynamic_symcount(abfd))) - { - _bfd_error_handler + ELF64_R_SYM (rela.r_info) > (dynamic + ? bfd_get_dynamic_symcount (abfd) + : bfd_get_symcount (abfd))) + { + _bfd_error_handler /* xgettext:c-format */ (_("%pB(%pA): relocation %d has invalid symbol index %ld"), abfd, asect, i, (long) ELF64_R_SYM (rela.r_info)); bfd_set_error (bfd_error_bad_value); relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; - } + } else { asymbol **ps, *s; diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c index 24b948a..a80e5b8 100644 --- a/bfd/elfnn-ia64.c +++ b/bfd/elfnn-ia64.c @@ -3872,7 +3872,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd, ret_val = FALSE; continue; } - + r_symndx = ELFNN_R_SYM (rel->r_info); h = NULL; sym = NULL; diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 29592db..245717f 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1542,9 +1542,9 @@ riscv_arch_str1 (riscv_subset_t *subset, snprintf (buf, bufsz, "%s%s%dp%d", underline, - subset->name, - subset->major_version, - subset->minor_version); + subset->name, + subset->major_version, + subset->minor_version); strncat (attr_str, buf, bufsz); diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 92e0b07..f09dcbd 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -4792,7 +4792,7 @@ _bfd_sparc_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *i htab = _bfd_sparc_elf_hash_table (info); BFD_ASSERT (htab != NULL); dynobj = htab->elf.dynobj; - + /* We arranged in size_dynamic_sections to put the STT_REGISTER entries at the end of the dynlocal list, so they came at the end of the local symbols in the symtab. Except that they aren't @@ -4802,7 +4802,7 @@ _bfd_sparc_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *i { asection *dynsymsec = bfd_get_linker_section (dynobj, ".dynsym"); struct elf_link_local_dynamic_entry *e; - + for (e = elf_hash_table (info)->dynlocal; e ; e = e->next) if (e->input_indx == -1) break; @@ -4810,7 +4810,7 @@ _bfd_sparc_elf_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *i elf_section_data (dynsymsec->output_section)->this_hdr.sh_info = e->dynindx; } - + sdyn = bfd_get_linker_section (dynobj, ".dynamic"); if (elf_hash_table (info)->dynamic_sections_created) diff --git a/bfd/linker.c b/bfd/linker.c index cf7d673..9e89c84 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -959,7 +959,7 @@ _bfd_generic_link_add_archive_symbols if (arsym->name == NULL) goto error_return; - + h = bfd_link_hash_lookup (info->hash, arsym->name, FALSE, FALSE, TRUE); diff --git a/bfd/mach-o.c b/bfd/mach-o.c index 122a0c2..d9edef2 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -647,7 +647,7 @@ cpusubtype (unsigned long cputype, unsigned long cpusubtype) break; } break; - + case BFD_MACH_O_CPU_TYPE_ARM: switch (cpusubtype) { @@ -667,7 +667,7 @@ cpusubtype (unsigned long cputype, unsigned long cpusubtype) break; } break; - + case BFD_MACH_O_CPU_TYPE_ARM64: switch (cpusubtype) { @@ -707,7 +707,7 @@ bfd_mach_o_bfd_print_private_bfd_data (bfd *abfd, void *ptr) fprintf (file, _(" sizeocmds: %#lx\n"), (long) mdata->header.sizeofcmds); fprintf (file, _(" flags: %#lx\n"), (long) mdata->header.flags); fprintf (file, _(" version: %x\n"), mdata->header.version); - + return TRUE; } @@ -748,7 +748,7 @@ bfd_mach_o_bfd_copy_private_header_data (bfd *ibfd, bfd *obfd) /* Copy the cpusubtype. */ omdata->header.cpusubtype = imdata->header.cpusubtype; - + /* Copy commands. */ for (icmd = imdata->first_command; icmd != NULL; icmd = icmd->next) { @@ -4928,11 +4928,11 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command) break; case BFD_MACH_O_LC_NOTE: if (!bfd_mach_o_read_note (abfd, command)) - return FALSE; + return FALSE; break; case BFD_MACH_O_LC_BUILD_VERSION: if (!bfd_mach_o_read_build_version (abfd, command)) - return FALSE; + return FALSE; break; default: command->len = 0; diff --git a/bfd/pe-x86_64.c b/bfd/pe-x86_64.c index 039cc93..9808ea1 100644 --- a/bfd/pe-x86_64.c +++ b/bfd/pe-x86_64.c @@ -101,19 +101,19 @@ x86_64_pe_be_vec = _bfd_dummy_target, amd64coff_object_p, bfd_generic_archive_p, - amd64coff_object_p + amd64coff_object_p }, { /* bfd_set_format. */ _bfd_bool_bfd_false_error, coff_mkobject, _bfd_generic_mkarchive, - _bfd_bool_bfd_false_error + _bfd_bool_bfd_false_error }, { /* bfd_write_contents. */ _bfd_bool_bfd_false_error, coff_write_object_contents, _bfd_write_archive_contents, - _bfd_bool_bfd_false_error + _bfd_bool_bfd_false_error }, BFD_JUMP_TABLE_GENERIC (coff), diff --git a/bfd/pei-x86_64.c b/bfd/pei-x86_64.c index 7e75104..8a88827 100644 --- a/bfd/pei-x86_64.c +++ b/bfd/pei-x86_64.c @@ -126,7 +126,7 @@ pex64_get_unwind_info (bfd *abfd, struct pex64_unwind_info *ui, ex_dta += ui->SizeOfBlock; if (ex_dta >= ex_dta_end) return FALSE; - + switch (ui->Flags) { case UNW_FLAG_CHAININFO: @@ -191,7 +191,7 @@ pex64_xdata_print_uwd_codes (FILE *file, bfd *abfd, fprintf (file, _("warning: corrupt unwind data\n")); return; } - + fprintf (file, "\tv2 epilog (length: %02x) at pc+:", ui->rawUnwindCodes[0]); @@ -220,7 +220,7 @@ pex64_xdata_print_uwd_codes (FILE *file, bfd *abfd, fprintf (file, _("warning: corrupt unwind data\n")); return; } - + for (; i < ui->CountOfCodes; i++) { const bfd_byte *dta = ui->rawUnwindCodes + 2 * i; diff --git a/bfd/plugin.c b/bfd/plugin.c index f99c4e1..8cb44ce 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -252,14 +252,14 @@ try_load_plugin (const char *pname, bfd *abfd, int *has_plugin_p) plugin_list_iter = plugin_list_iter->next) { if (plugin_handle == plugin_list_iter->handle) - { - dlclose (plugin_handle); - if (!plugin_list_iter->claim_file) - return 0; - - register_claim_file (plugin_list_iter->claim_file); - goto have_claim_file; - } + { + dlclose (plugin_handle); + if (!plugin_list_iter->claim_file) + return 0; + + register_claim_file (plugin_list_iter->claim_file); + goto have_claim_file; + } } plugin_list_iter = (struct plugin_list_entry *) xmalloc (sizeof *plugin_list_iter); |