From f8ecb12b16adaae13e187352852113cda9c5394d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 6 Jun 2002 00:29:22 +0000 Subject: [PATCH] elf_swap_symbol_in args should be "const PTR", not "const PTR *". --- bfd/ChangeLog | 41 +++++++++++++++++++++++++++++++++++++++++ bfd/elf-bfd.h | 6 +++--- bfd/elf-m10200.c | 12 ++++++------ bfd/elf-m10300.c | 24 ++++++++++++------------ bfd/elf32-h8300.c | 16 ++++++++-------- bfd/elf32-hppa.c | 4 ++-- bfd/elf32-m68k.c | 4 ++-- bfd/elf32-mips.c | 4 ++-- bfd/elf32-sh.c | 18 +++++++++--------- bfd/elf32-xstormy16.c | 4 ++-- bfd/elf64-alpha.c | 4 ++-- bfd/elf64-hppa.c | 4 ++-- bfd/elf64-mmix.c | 4 ++-- bfd/elf64-ppc.c | 4 ++-- bfd/elf64-sh64.c | 4 ++-- bfd/elfcode.h | 8 ++++---- bfd/elflink.h | 20 ++++++++++---------- bfd/elfxx-ia64.c | 4 ++-- bfd/po/SRC-POTFILES.in | 3 +++ 19 files changed, 116 insertions(+), 72 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ce42c48406c..772c0757695 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,44 @@ +2002-06-06 Alan Modra + + * elf-bfd.h (struct elf_size_info ): Function args + are "const PTR", not "const PTR *". + (bfd_elf32_swap_symbol_in): Likewise. + (bfd_elf64_swap_symbol_in): Likewise. + * elfcode.h (elf_swap_symbol_in): Change input args to const PTR. + (elf_slurp_symbol_table): Adjust call to elf_swap_symbol_in. + * elflink.h (elf_link_is_defined_archive_symbol): Likewise. + (elf_link_add_object_symbols): Likewise. + (elf_link_record_local_dynamic_symbol): Likewise. + (elf_link_input_bfd): Likewise. + (elf_gc_mark): Likewise. + (elf_reloc_symbol_deleted_p): Likewise. + * elf-m10200.c (mn10200_elf_relax_section): Likewise. + (mn10200_elf_relax_delete_bytes): Likewise. + (mn10200_elf_symbol_address_p): Likewise. + (mn10200_elf_get_relocated_section_contents): Likewise. + * elf-m10300.c (mn10300_elf_relax_section): Likewise. + (mn10300_elf_relax_section): Likewise. + (mn10300_elf_relax_delete_bytes): Likewise. + (mn10300_elf_symbol_address_p): Likewise. + (mn10300_elf_get_relocated_section_contents): Likewise. + * elf32-h8300.c (elf32_h8_relax_section): Likewise. + (elf32_h8_relax_delete_bytes): Likewise. + (elf32_h8_symbol_address_p): Likewise. + (elf32_h8_get_relocated_section_contents): Likewise. + * elf32-hppa.c (get_local_syms): Likewise. + * elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Likewise. + * elf32-mips.c (bfd_mips_elf32_create_embedded_relocs): Likewise. + * elf32-sh.c (sh_elf_relax_section): Likewise. + (sh_elf_relax_delete_bytes): Likewise. + (sh_elf_get_relocated_section_contents): Likewise. + * elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise. + * elf64-alpha.c (elf64_alpha_relax_section): Likewise. + * elf64-hppa.c (elf64_hppa_check_relocs): Likewise. + * elf64-mmix.c (mmix_elf_relax_section): Likewise. + * elf64-ppc.c (get_local_syms): Likewise. + * elf64-sh64.c (sh_elf64_get_relocated_section_contents): Likewise. + * elfxx-ia64.c (elfNN_ia64_relax_section): Likewise. + Wed Jun 5 20:43:27 2002 J"orn Rennecke * config.bfd (sh64l*-*-elf*, shl*-*-elf*): New configurations. diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 9d767062196..238a6d63385 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -354,7 +354,7 @@ struct elf_size_info { void (*write_relocs) PARAMS ((bfd *, asection *, PTR)); void (*swap_symbol_in) - PARAMS ((bfd *, const PTR *, const PTR *, Elf_Internal_Sym *)); + PARAMS ((bfd *, const PTR, const PTR, Elf_Internal_Sym *)); void (*swap_symbol_out) PARAMS ((bfd *, const Elf_Internal_Sym *, PTR, PTR)); boolean (*slurp_reloc_table) @@ -1443,7 +1443,7 @@ extern boolean bfd_elf32_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *)); extern void bfd_elf32_swap_symbol_in - PARAMS ((bfd *, const PTR *, const PTR *, Elf_Internal_Sym *)); + PARAMS ((bfd *, const PTR, const PTR, Elf_Internal_Sym *)); extern void bfd_elf32_swap_symbol_out PARAMS ((bfd *, const Elf_Internal_Sym *, PTR, PTR)); extern void bfd_elf32_swap_reloc_in @@ -1495,7 +1495,7 @@ extern boolean bfd_elf64_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *)); extern void bfd_elf64_swap_symbol_in - PARAMS ((bfd *, const PTR *, const PTR *, Elf_Internal_Sym *)); + PARAMS ((bfd *, const PTR, const PTR, Elf_Internal_Sym *)); extern void bfd_elf64_swap_symbol_out PARAMS ((bfd *, const Elf_Internal_Sym *, PTR, PTR)); extern void bfd_elf64_swap_reloc_in diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c index fe240fd6301..e833af6037e 100644 --- a/bfd/elf-m10200.c +++ b/bfd/elf-m10200.c @@ -630,8 +630,8 @@ mn10200_elf_relax_section (abfd, sec, link_info, again) esym = extsyms + ELF32_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); if (isym.st_shndx == SHN_UNDEF) sym_sec = bfd_und_section_ptr; @@ -1318,7 +1318,7 @@ mn10200_elf_relax_delete_bytes (abfd, sec, addr, count) Elf_Internal_Sym isym; Elf_External_Sym_Shndx dummy; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -1380,7 +1380,7 @@ mn10200_elf_symbol_address_p (abfd, sec, addr) { Elf_Internal_Sym isym; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -1503,8 +1503,8 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order, { asection *isec; - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isymp); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isymp); if (isymp->st_shndx == SHN_UNDEF) isec = bfd_und_section_ptr; diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index 1cc9f4c3540..56350e59f8d 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -938,8 +938,8 @@ mn10300_elf_relax_section (abfd, sec, link_info, again) esym = extsyms + r_index; shndx = shndx_buf + (shndx_buf ? r_index : 0); bfd_elf32_swap_symbol_in (input_bfd, - (const PTR *) esym, - (const PTR *) shndx, + (const PTR) esym, + (const PTR) shndx, &isym); if (isym.st_shndx == SHN_UNDEF) @@ -1030,8 +1030,8 @@ mn10300_elf_relax_section (abfd, sec, link_info, again) { Elf_Internal_Sym isym; - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx && ELF_ST_TYPE (isym.st_info) == STT_FUNC) { @@ -1257,8 +1257,8 @@ mn10300_elf_relax_section (abfd, sec, link_info, again) struct elf_link_hash_table *elftab; bfd_size_type amt; - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, &isym); if (isym.st_shndx != sec_shndx) continue; @@ -1555,8 +1555,8 @@ mn10300_elf_relax_section (abfd, sec, link_info, again) /* A local symbol. */ esym = extsyms + ELF32_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, + (const PTR) shndx, &isym); if (isym.st_shndx == SHN_UNDEF) sym_sec = bfd_und_section_ptr; @@ -2679,7 +2679,7 @@ mn10300_elf_relax_delete_bytes (abfd, sec, addr, count) Elf_Internal_Sym isym; Elf_External_Sym_Shndx dummy; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -2741,7 +2741,7 @@ mn10300_elf_symbol_address_p (abfd, sec, addr) { Elf_Internal_Sym isym; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -2864,8 +2864,8 @@ mn10300_elf_get_relocated_section_contents (output_bfd, link_info, link_order, { asection *isec; - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isymp); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isymp); if (isymp->st_shndx == SHN_UNDEF) isec = bfd_und_section_ptr; diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c index 4a152e2705e..66e563edd75 100644 --- a/bfd/elf32-h8300.c +++ b/bfd/elf32-h8300.c @@ -816,8 +816,8 @@ elf32_h8_relax_section (abfd, sec, link_info, again) /* A local symbol. */ esym = extsyms + ELF32_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx); symval = (isym.st_value @@ -913,8 +913,8 @@ elf32_h8_relax_section (abfd, sec, link_info, again) shndx = shndx_buf; if (shndx != NULL) shndx += ELF32_R_SYM (last_reloc->r_info); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, + (const PTR) shndx, &last_symbol); last_sym_sec @@ -1342,7 +1342,7 @@ elf32_h8_relax_delete_bytes (abfd, sec, addr, count) Elf_Internal_Sym isym; Elf_External_Sym_Shndx dummy; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -1404,7 +1404,7 @@ elf32_h8_symbol_address_p (abfd, sec, addr) { Elf_Internal_Sym isym; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -1527,8 +1527,8 @@ elf32_h8_get_relocated_section_contents (output_bfd, link_info, link_order, { asection *isec; - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isymp); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isymp); if (isymp->st_shndx == SHN_UNDEF) isec = bfd_und_section_ptr; diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 68d65189e4c..684213514cd 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -2827,8 +2827,8 @@ get_local_syms (output_bfd, input_bfd, info) isym = local_syms, shndx = shndx_buf; esym < end_sy; esym++, isym++, shndx = (shndx ? shndx + 1 : NULL)) - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isym); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isym); /* Now we can free the external symbols. */ free (shndx_buf); diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 628096a7f92..2006652cb3e 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -2211,8 +2211,8 @@ bfd_m68k_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg) /* A local symbol. */ esym = extsyms + ELF32_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); targetsec = bfd_section_from_elf_index (abfd, isym.st_shndx); } diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index de9cf2f8f47..92887385745 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -1886,8 +1886,8 @@ bfd_mips_elf32_create_embedded_relocs (abfd, info, datasec, relsec, errmsg) /* A local symbol. */ esym = extsyms + ELF32_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); targetsec = bfd_section_from_elf_index (abfd, isym.st_shndx); } diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 3e8de13c8f8..e37d0d14d9a 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -2067,8 +2067,8 @@ sh_elf_relax_section (abfd, sec, link_info, again) esym = extsyms + ELF32_R_SYM (irelfn->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irelfn->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); if (isym.st_shndx != (unsigned int) _bfd_elf_section_from_bfd_section (abfd, sec)) @@ -2448,8 +2448,8 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count) { esym = extsyms + ELF32_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &sym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, + (const PTR) shndx, &sym); if (sym.st_shndx == sec_shndx && (sym.st_value <= addr @@ -2712,8 +2712,8 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count) esym = extsyms + ELF32_R_SYM (irelscan->r_info); shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irelscan->r_info) : 0); - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &sym); + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &sym); if (sym.st_shndx == sec_shndx && (sym.st_value <= addr @@ -2760,7 +2760,7 @@ sh_elf_relax_delete_bytes (abfd, sec, addr, count) Elf_Internal_Sym isym; Elf_External_Sym_Shndx dummy; - bfd_elf32_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, + bfd_elf32_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &isym); if (isym.st_shndx == sec_shndx @@ -4928,8 +4928,8 @@ sh_elf_get_relocated_section_contents (output_bfd, link_info, link_order, { asection *isec; - bfd_elf32_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isymp); + bfd_elf32_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isymp); if (isymp->st_shndx == SHN_UNDEF) isec = bfd_und_section_ptr; diff --git a/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c index 57ee1fea591..d58ea9cffc8 100644 --- a/bfd/elf32-xstormy16.c +++ b/bfd/elf32-xstormy16.c @@ -654,8 +654,8 @@ xstormy16_elf_relax_section (dynobj, splt, info, again) shndx = shndx_buf; if (shndx != NULL) shndx += idx; - bfd_elf32_swap_symbol_in (ibfd, (const PTR *) (extsyms + idx), - (const PTR *) shndx, &isym); + bfd_elf32_swap_symbol_in (ibfd, (const PTR) (extsyms + idx), + (const PTR) shndx, &isym); if (isym.st_shndx == SHN_UNDEF) continue; else if (isym.st_shndx == SHN_ABS) diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 026740aeea1..67ada729bb3 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -2172,8 +2172,8 @@ elf64_alpha_relax_section (abfd, sec, link_info, again) esym = extsyms + ELF64_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF64_R_SYM (irel->r_info) : 0); - bfd_elf64_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf64_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); if (isym.st_shndx == SHN_UNDEF) continue; else if (isym.st_shndx == SHN_ABS) diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index e41e605cd96..d110d76d9ce 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -682,8 +682,8 @@ elf64_hppa_check_relocs (abfd, info, sec, relocs) i < symtab_hdr->sh_info; i++, esym++, isym++, shndx = (shndx != NULL ? shndx + 1 : NULL)) { - bfd_elf64_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, isym); + bfd_elf64_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + isym); if (isym->st_shndx > highest_shndx) highest_shndx = isym->st_shndx; } diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index 729dfb84654..55ef061d645 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -2419,8 +2419,8 @@ mmix_elf_relax_section (abfd, sec, link_info, again) esym = extsyms + ELF64_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELF64_R_SYM (irel->r_info) : 0); - bfd_elf64_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elf64_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); if (isym.st_shndx == SHN_UNDEF) sym_sec = bfd_und_section_ptr; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index eb0f4d3e432..d8ac56ec5c6 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -4594,8 +4594,8 @@ get_local_syms (input_bfd, htab) isym = local_syms, shndx = shndx_buf; esym < end_sy; esym++, isym++, shndx = (shndx ? shndx + 1 : NULL)) - bfd_elf64_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isym); + bfd_elf64_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isym); /* Now we can free the external symbols. */ free (shndx_buf); diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index b06b0ff22d8..091849690e7 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -2234,8 +2234,8 @@ sh_elf64_get_relocated_section_contents (output_bfd, link_info, link_order, { asection *isec; - bfd_elf64_swap_symbol_in (input_bfd, (const PTR *) esym, - (const PTR *) shndx, isymp); + bfd_elf64_swap_symbol_in (input_bfd, (const PTR) esym, + (const PTR) shndx, isymp); if (isymp->st_shndx == SHN_UNDEF) isec = bfd_und_section_ptr; diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 1a362eebcc5..3e29c0287b1 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -205,8 +205,8 @@ static char *elf_symbol_flags PARAMS ((flagword)); void elf_swap_symbol_in (abfd, psrc, pshn, dst) bfd *abfd; - const PTR *psrc; - const PTR *pshn; + const PTR psrc; + const PTR pshn; Elf_Internal_Sym *dst; { const Elf_External_Sym *src = (const Elf_External_Sym *) psrc; @@ -1244,8 +1244,8 @@ elf_slurp_symbol_table (abfd, symptrs, dynamic) /* Skip first symbol, which is a null dummy. */ for (i = 1; i < symcount; i++) { - elf_swap_symbol_in (abfd, (const PTR *) (x_symp + i), - (const PTR *) (x_shndx + (x_shndx ? i : 0)), + elf_swap_symbol_in (abfd, (const PTR) (x_symp + i), + (const PTR) (x_shndx + (x_shndx ? i : 0)), &i_sym); memcpy (&sym->internal_elf_sym, &i_sym, sizeof (Elf_Internal_Sym)); #ifdef ELF_KEEP_EXTSYM diff --git a/bfd/elflink.h b/bfd/elflink.h index 8c221f983cf..e80e867e590 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -237,7 +237,7 @@ elf_link_is_defined_archive_symbol (abfd, symdef) Elf_Internal_Sym sym; const char * name; - elf_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, &sym); + elf_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &sym); name = bfd_elf_string_from_elf_section (abfd, hdr->sh_link, sym.st_name); if (name == (const char *) NULL) @@ -1666,7 +1666,7 @@ elf_link_add_object_symbols (abfd, info) override = false; - elf_swap_symbol_in (abfd, (const PTR *) esym, (const PTR *) shndx, &sym); + elf_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, &sym); flags = BSF_NO_FLAGS; sec = NULL; @@ -2556,7 +2556,7 @@ elf_link_record_local_dynamic_symbol (info, input_bfd, input_indx) || bfd_bread ((PTR) shndx, amt, input_bfd) != amt) return false; } - elf_swap_symbol_in (input_bfd, (const PTR *) &esym, (const PTR *) shndx, + elf_swap_symbol_in (input_bfd, (const PTR) &esym, (const PTR) shndx, &entry->isym); name = (bfd_elf_string_from_elf_section @@ -6522,7 +6522,7 @@ elf_link_input_bfd (finfo, input_bfd) const char *name; Elf_Internal_Sym osym; - elf_swap_symbol_in (input_bfd, (const PTR *) esym, (const PTR *) shndx, + elf_swap_symbol_in (input_bfd, (const PTR) esym, (const PTR) shndx, isym); *pindex = -1; @@ -7672,8 +7672,8 @@ elf_gc_mark (info, sec, gc_mark_hook) { locshndx = locsym_shndx + (locsym_shndx ? r_symndx : 0); elf_swap_symbol_in (input_bfd, - (const PTR *) (locsyms + r_symndx), - (const PTR *) locshndx, + (const PTR) (locsyms + r_symndx), + (const PTR) locshndx, &s); if (ELF_ST_BIND (s.st_info) == STB_LOCAL) rsec = (*gc_mark_hook) (sec->owner, info, rel, NULL, &s); @@ -7692,8 +7692,8 @@ elf_gc_mark (info, sec, gc_mark_hook) { locshndx = locsym_shndx + (locsym_shndx ? r_symndx : 0); elf_swap_symbol_in (input_bfd, - (const PTR *) (locsyms + r_symndx), - (const PTR *) locshndx, + (const PTR) (locsyms + r_symndx), + (const PTR) locshndx, &s); rsec = (*gc_mark_hook) (sec->owner, info, rel, NULL, &s); } @@ -8287,8 +8287,8 @@ elf_reloc_symbol_deleted_p (offset, cookie) lshndx = (Elf_External_Sym_Shndx *) rcookie->locsym_shndx; if (lshndx != NULL) lshndx += r_symndx; - elf_swap_symbol_in (rcookie->abfd, (const PTR *) lsym, - (const PTR *) lshndx, &isym); + elf_swap_symbol_in (rcookie->abfd, (const PTR) lsym, + (const PTR) lshndx, &isym); } if (r_symndx >= rcookie->locsymcount diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c index 0e3d0db84fb..c86ad43ac85 100644 --- a/bfd/elfxx-ia64.c +++ b/bfd/elfxx-ia64.c @@ -812,8 +812,8 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again) /* A local symbol. */ esym = extsyms + ELFNN_R_SYM (irel->r_info); shndx = shndx_buf + (shndx_buf ? ELFNN_R_SYM (irel->r_info) : 0); - bfd_elfNN_swap_symbol_in (abfd, (const PTR *) esym, - (const PTR *) shndx, &isym); + bfd_elfNN_swap_symbol_in (abfd, (const PTR) esym, (const PTR) shndx, + &isym); if (isym.st_shndx == SHN_UNDEF) continue; /* We can't do anthing with undefined symbols. */ else if (isym.st_shndx == SHN_ABS) diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index 6d83b7cad51..086d8022d59 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -151,6 +151,8 @@ elf32-s390.c elf32-sh-lin.c elf32-sh-nbsd.c elf32-sh.c +elf32-sh64-com.c +elf32-sh64-nbsd.c elf32-sh64.c elf32-sparc.c elf32-v850.c @@ -165,6 +167,7 @@ elf64-mips.c elf64-mmix.c elf64-ppc.c elf64-s390.c +elf64-sh64-nbsd.c elf64-sh64.c elf64-sparc.c elf64-x86-64.c -- 2.30.2