BFD whitespace fixes

* 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.
This commit is contained in:
Alan Modra 2019-04-02 16:38:20 +10:30
parent 49149495da
commit 4b24dd1aca
24 changed files with 196 additions and 187 deletions

View file

@ -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

208
bfd/elf.c
View file

@ -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 *

View file

@ -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

View file

@ -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;

View file

@ -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,

View file

@ -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. */

View file

@ -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"

View file

@ -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;

View file

@ -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);

View file

@ -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;

View file

@ -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;
{
dlclose (plugin_handle);
if (!plugin_list_iter->claim_file)
return 0;
register_claim_file (plugin_list_iter->claim_file);
goto have_claim_file;
}
register_claim_file (plugin_list_iter->claim_file);
goto have_claim_file;
}
}
plugin_list_iter = (struct plugin_list_entry *) xmalloc (sizeof *plugin_list_iter);