S390: Indentation fixes in elf32/64-s390.c
Some indentation fixes in elf32-s390.c and elf64-s390.c. Whitespace changes only. bfd/ChangeLog: * elf32-s390.c (allocate_dynrelocs): Fix indentation. (elf_s390_finish_ifunc_symbol): Likewise. (elf_s390_finish_dynamic_symbol): Likewise. (elf_s390_finish_dynamic_sections): Likewise. (elf_s390_grok_prstatus): Likewise. * elf64-s390.c (elf_s390_hash_table): Fix indentation. (elf_s390_finish_dynamic_symbol): Likewise.
This commit is contained in:
parent
ae68ff9f28
commit
ceada89664
3 changed files with 31 additions and 21 deletions
|
@ -1,3 +1,13 @@
|
|||
2016-08-25 Andreas Arnez <arnez@linux.vnet.ibm.com>
|
||||
|
||||
* elf32-s390.c (allocate_dynrelocs): Fix indentation.
|
||||
(elf_s390_finish_ifunc_symbol): Likewise.
|
||||
(elf_s390_finish_dynamic_symbol): Likewise.
|
||||
(elf_s390_finish_dynamic_sections): Likewise.
|
||||
(elf_s390_grok_prstatus): Likewise.
|
||||
* elf64-s390.c (elf_s390_hash_table): Fix indentation.
|
||||
(elf_s390_finish_dynamic_symbol): Likewise.
|
||||
|
||||
2016-08-24 Anton Kolesov <Anton.Kolesov@synopsys.com>
|
||||
|
||||
* elf32-arc.c (elf32_arc_grok_prstatus): New function.
|
||||
|
|
|
@ -1917,7 +1917,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
|
|||
h->got.offset = (bfd_vma) -1;
|
||||
}
|
||||
else if (h->got.refcount > 0)
|
||||
{
|
||||
{
|
||||
asection *s;
|
||||
bfd_boolean dyn;
|
||||
int tls_type = elf_s390_hash_entry(h)->tls_type;
|
||||
|
@ -3497,8 +3497,8 @@ elf_s390_finish_ifunc_symbol (bfd *output_bfd,
|
|||
/* S390 uses halfwords for relative branch calc! */
|
||||
relative_offset = - (plt->output_offset +
|
||||
(PLT_ENTRY_SIZE * iplt_index) + 18) / 2;
|
||||
/* If offset is > 32768, branch to a previous branch
|
||||
390 can only handle +-64 K jumps. */
|
||||
/* If offset is > 32768, branch to a previous branch
|
||||
390 can only handle +-64 K jumps. */
|
||||
if ( -32768 > (int) relative_offset )
|
||||
relative_offset
|
||||
= -(unsigned) (((65536 / PLT_ENTRY_SIZE - 1) * PLT_ENTRY_SIZE) / 2);
|
||||
|
@ -3810,7 +3810,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
|
|||
}
|
||||
}
|
||||
else if (bfd_link_pic (info)
|
||||
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
||||
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
||||
{
|
||||
/* If this is a static link, or it is a -Bsymbolic link and
|
||||
the symbol is defined locally or was forced to be local
|
||||
|
@ -3982,7 +3982,7 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
|
|||
htab->elf.sgotplt->output_section->vma
|
||||
+ htab->elf.sgotplt->output_offset,
|
||||
htab->elf.splt->contents + 24);
|
||||
}
|
||||
}
|
||||
elf_section_data (htab->elf.splt->output_section)
|
||||
->this_hdr.sh_entsize = 4;
|
||||
}
|
||||
|
@ -4048,20 +4048,20 @@ elf_s390_grok_prstatus (bfd * abfd, Elf_Internal_Note * note)
|
|||
|
||||
switch (note->descsz)
|
||||
{
|
||||
default:
|
||||
return FALSE;
|
||||
default:
|
||||
return FALSE;
|
||||
|
||||
case 224: /* S/390 Linux. */
|
||||
/* pr_cursig */
|
||||
elf_tdata (abfd)->core->signal = bfd_get_16 (abfd, note->descdata + 12);
|
||||
case 224: /* S/390 Linux. */
|
||||
/* pr_cursig */
|
||||
elf_tdata (abfd)->core->signal = bfd_get_16 (abfd, note->descdata + 12);
|
||||
|
||||
/* pr_pid */
|
||||
elf_tdata (abfd)->core->lwpid = bfd_get_32 (abfd, note->descdata + 24);
|
||||
/* pr_pid */
|
||||
elf_tdata (abfd)->core->lwpid = bfd_get_32 (abfd, note->descdata + 24);
|
||||
|
||||
/* pr_reg */
|
||||
offset = 72;
|
||||
size = 144;
|
||||
break;
|
||||
/* pr_reg */
|
||||
offset = 72;
|
||||
size = 144;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Make a ".reg/999" section. */
|
||||
|
|
|
@ -664,9 +664,9 @@ struct elf_s390_link_hash_table
|
|||
|
||||
/* Get the s390 ELF linker hash table from a link_info structure. */
|
||||
|
||||
#define elf_s390_hash_table(p) \
|
||||
(elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
|
||||
== S390_ELF_DATA ? ((struct elf_s390_link_hash_table *) ((p)->hash)) : NULL)
|
||||
#define elf_s390_hash_table(p) \
|
||||
(elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
|
||||
== S390_ELF_DATA ? ((struct elf_s390_link_hash_table *) ((p)->hash)) : NULL)
|
||||
|
||||
#define ELF64 1
|
||||
#include "elf-s390-common.c"
|
||||
|
@ -3603,7 +3603,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
|
|||
}
|
||||
}
|
||||
else if (bfd_link_pic (info)
|
||||
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
||||
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
||||
{
|
||||
/* If this is a static link, or it is a -Bsymbolic link and
|
||||
the symbol is defined locally or was forced to be local
|
||||
|
@ -3622,7 +3622,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
|
|||
else
|
||||
{
|
||||
BFD_ASSERT((h->got.offset & 1) == 0);
|
||||
do_glob_dat:
|
||||
do_glob_dat:
|
||||
bfd_put_64 (output_bfd, (bfd_vma) 0, htab->elf.sgot->contents + h->got.offset);
|
||||
rela.r_info = ELF64_R_INFO (h->dynindx, R_390_GLOB_DAT);
|
||||
rela.r_addend = 0;
|
||||
|
|
Loading…
Reference in a new issue