1999-05-03 15:29:11 +08:00
|
|
|
|
/* ELF linking support for BFD.
|
2004-03-16 18:31:18 +08:00
|
|
|
|
Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
2001-03-09 05:04:02 +08:00
|
|
|
|
Free Software Foundation, Inc.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "sysdep.h"
|
|
|
|
|
#include "bfdlink.h"
|
|
|
|
|
#include "libbfd.h"
|
|
|
|
|
#define ARCH_SIZE 0
|
|
|
|
|
#include "elf-bfd.h"
|
2004-03-26 13:55:15 +08:00
|
|
|
|
#include "safe-ctype.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
flagword flags;
|
2003-02-24 12:50:04 +08:00
|
|
|
|
asection *s;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct elf_link_hash_entry *h;
|
2002-10-11 16:33:11 +08:00
|
|
|
|
struct bfd_link_hash_entry *bh;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
int ptralign;
|
|
|
|
|
|
|
|
|
|
/* This function may be called more than once. */
|
2003-02-24 12:50:04 +08:00
|
|
|
|
s = bfd_get_section_by_name (abfd, ".got");
|
|
|
|
|
if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
switch (bed->s->arch_size)
|
|
|
|
|
{
|
2000-08-17 02:02:16 +08:00
|
|
|
|
case 32:
|
|
|
|
|
ptralign = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 64:
|
|
|
|
|
ptralign = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
|
|
|
|
|
| SEC_LINKER_CREATED);
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".got");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| !bfd_set_section_flags (abfd, s, flags)
|
|
|
|
|
|| !bfd_set_section_alignment (abfd, s, ptralign))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (bed->want_got_plt)
|
|
|
|
|
{
|
|
|
|
|
s = bfd_make_section (abfd, ".got.plt");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| !bfd_set_section_flags (abfd, s, flags)
|
|
|
|
|
|| !bfd_set_section_alignment (abfd, s, ptralign))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-08-08 21:09:33 +08:00
|
|
|
|
if (bed->want_got_sym)
|
|
|
|
|
{
|
|
|
|
|
/* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
|
|
|
|
|
(or .got.plt) section. We don't do this in the linker script
|
|
|
|
|
because we don't want to define the symbol if we are not creating
|
|
|
|
|
a global offset table. */
|
2002-10-11 16:33:11 +08:00
|
|
|
|
bh = NULL;
|
2001-08-08 21:09:33 +08:00
|
|
|
|
if (!(_bfd_generic_link_add_one_symbol
|
|
|
|
|
(info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
|
2003-08-04 17:39:46 +08:00
|
|
|
|
bed->got_symbol_offset, NULL, FALSE, bed->collect, &bh)))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
2002-10-11 16:33:11 +08:00
|
|
|
|
h = (struct elf_link_hash_entry *) bh;
|
2001-08-08 21:09:33 +08:00
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
h->type = STT_OBJECT;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-05-30 23:50:12 +08:00
|
|
|
|
if (! info->executable
|
2001-08-08 21:09:33 +08:00
|
|
|
|
&& ! _bfd_elf_link_record_dynamic_symbol (info, h))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2001-08-08 21:09:33 +08:00
|
|
|
|
elf_hash_table (info)->hgot = h;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The first bit of the global offset table is the header. */
|
|
|
|
|
s->_raw_size += bed->got_header_size + bed->got_symbol_offset;
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* Create some sections which will be filled in with dynamic linking
|
|
|
|
|
information. ABFD is an input file which requires dynamic sections
|
|
|
|
|
to be created. The dynamic sections take up virtual memory space
|
|
|
|
|
when the final executable is run, so we need to create them before
|
|
|
|
|
addresses are assigned to the output sections. We work out the
|
|
|
|
|
actual contents and size of these sections later. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
flagword flags;
|
|
|
|
|
register asection *s;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
struct bfd_link_hash_entry *bh;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-12-01 14:28:24 +08:00
|
|
|
|
if (! is_elf_hash_table (info->hash))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* Make sure that all dynamic sections use the same input BFD. */
|
|
|
|
|
if (elf_hash_table (info)->dynobj == NULL)
|
|
|
|
|
elf_hash_table (info)->dynobj = abfd;
|
|
|
|
|
else
|
|
|
|
|
abfd = elf_hash_table (info)->dynobj;
|
|
|
|
|
|
|
|
|
|
/* Note that we set the SEC_IN_MEMORY flag for all of these
|
|
|
|
|
sections. */
|
|
|
|
|
flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
|
|
|
|
|
| SEC_IN_MEMORY | SEC_LINKER_CREATED);
|
|
|
|
|
|
|
|
|
|
/* A dynamically linked executable has a .interp section, but a
|
|
|
|
|
shared library does not. */
|
2003-05-30 23:50:12 +08:00
|
|
|
|
if (info->executable)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
s = bfd_make_section (abfd, ".interp");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2000-08-17 02:02:16 +08:00
|
|
|
|
|
2003-12-01 14:28:24 +08:00
|
|
|
|
if (! info->traditional_format)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
s = bfd_make_section (abfd, ".eh_frame_hdr");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, 2))
|
|
|
|
|
return FALSE;
|
|
|
|
|
elf_hash_table (info)->eh_info.hdr_sec = s;
|
|
|
|
|
}
|
2000-08-17 02:02:16 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
|
|
|
|
|
|
/* Create sections to hold version informations. These are removed
|
|
|
|
|
if they are not needed. */
|
|
|
|
|
s = bfd_make_section (abfd, ".gnu.version_d");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".gnu.version");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, 1))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".gnu.version_r");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".dynsym");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".dynstr");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Create a strtab to hold the dynamic symbol names. */
|
|
|
|
|
if (elf_hash_table (info)->dynstr == NULL)
|
|
|
|
|
{
|
|
|
|
|
elf_hash_table (info)->dynstr = _bfd_elf_strtab_init ();
|
|
|
|
|
if (elf_hash_table (info)->dynstr == NULL)
|
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
s = bfd_make_section (abfd, ".dynamic");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* The special symbol _DYNAMIC is always set to the start of the
|
|
|
|
|
.dynamic section. This call occurs before we have processed the
|
|
|
|
|
symbols for any dynamic object, so we don't have to worry about
|
|
|
|
|
overriding a dynamic definition. We could set _DYNAMIC in a
|
|
|
|
|
linker script, but we only want to define it if we are, in fact,
|
|
|
|
|
creating a .dynamic section. We don't want to define it if there
|
|
|
|
|
is no .dynamic section, since on some ELF platforms the start up
|
|
|
|
|
code examines it to decide how to initialize the process. */
|
|
|
|
|
bh = NULL;
|
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
2003-08-04 17:39:46 +08:00
|
|
|
|
(info, abfd, "_DYNAMIC", BSF_GLOBAL, s, 0, NULL, FALSE,
|
|
|
|
|
get_elf_backend_data (abfd)->collect, &bh)))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
h = (struct elf_link_hash_entry *) bh;
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
h->type = STT_OBJECT;
|
|
|
|
|
|
2003-05-30 23:50:12 +08:00
|
|
|
|
if (! info->executable
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& ! _bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".hash");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
|
|
|
|
return FALSE;
|
|
|
|
|
elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
|
|
|
|
|
|
|
|
|
|
/* Let the backend create the rest of the sections. This lets the
|
|
|
|
|
backend set the right flags. The backend will normally create
|
|
|
|
|
the .got and .plt sections. */
|
|
|
|
|
if (! (*bed->elf_backend_create_dynamic_sections) (abfd, info))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
elf_hash_table (info)->dynamic_sections_created = TRUE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create dynamic sections when linking against a dynamic object. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
flagword flags, pltflags;
|
|
|
|
|
asection *s;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
|
|
|
|
|
.rel[a].bss sections. */
|
|
|
|
|
|
|
|
|
|
flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
|
|
|
|
|
| SEC_LINKER_CREATED);
|
|
|
|
|
|
|
|
|
|
pltflags = flags;
|
|
|
|
|
pltflags |= SEC_CODE;
|
|
|
|
|
if (bed->plt_not_loaded)
|
* elflink.c (_bfd_elf_create_dynamic_sections): Don't set SEC_CODE
when plt_not_loaded.
* elf64-ppc.c (ppc64_elf_create_dynamic_sections): No need to
clear .plt SEC_CODE here. Create .stub and correct .glink flags.
(PLT_INITIAL_ENTRY_SIZE): Set to 24.
(ppc64_elf_glink_code): Delete.
(PPC64_ELF_GLINK_SIZE): Delete.
(ADDIS_R12_R2, STD_R2_40R1, LD_R11_0R12, LD_R2_0R12, MTCTR_R11,
BCTR, ADDIS_R12_R12_1, LD_R2_40R1, NOP, LI_R0_0, B_DOT, LIS_R0_0,
ORI_R0_R0_0): Define.
(PLT_CALL_STUB_SIZE, GLINK_CALL_STUB_SIZE): Define.
(struct ppc_link_hash_table): Add sstub and plt_overflow.
(ppc64_elf_link_hash_table_create): Init them.
(ppc64_elf_check_relocs <R_PPC64_REL24>): Refcount .plt entry.
Don't copy to shared lib.
(ppc64_elf_check_relocs): Call bfd_set_error on errors.
(ppc64_elf_gc_sweep_hook <R_PPC64_REL24>): Sweep plt refcount.
(allocate_dynrelocs <plt>): Don't change function sym here. Make
room for .stub and .glink code.
(ppc64_elf_size_dynamic_sections): Handle .stub. Make entry for
DT_PPC64_GLINK.
(ppc64_elf_final_link): Rename to ppc64_elf_set_toc. Don't call
bfd_elf64_bfd_final_link.
(bfd_elf64_bfd_final_link): Don't define.
(ppc64_elf_size_stubs): New.
(build_plt_stub): New.
(build_one_stub): New.
(ppc64_elf_build_stubs): New.
(ppc64_elf_relocate_section <toc relocs>): Remove assert.
(ppc64_elf_relocate_section): Don't copy R_PPC64_REL24 relocs.
(ppc64_elf_finish_dynamic_symbol): Don't build stubs here. Set
DT_PPC64_GLINK entry. Tweak DT_PLTGOT, DT_JMPREL, DT_PLTRELSZ in
case output sections not separate. Adjust DT_RELASZ to not
include plt relocs. Set reserved got entry. Set got and plt
entry size.
(elf_backend_got_header_size): Set to 8.
* elf64-ppc.h: New file.
2002-01-16 13:50:03 +08:00
|
|
|
|
pltflags &= ~ (SEC_CODE | SEC_LOAD | SEC_HAS_CONTENTS);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (bed->plt_readonly)
|
|
|
|
|
pltflags |= SEC_READONLY;
|
|
|
|
|
|
|
|
|
|
s = bfd_make_section (abfd, ".plt");
|
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, pltflags)
|
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (bed->want_plt_sym)
|
|
|
|
|
{
|
|
|
|
|
/* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
|
|
|
|
|
.plt section. */
|
2002-10-11 16:33:11 +08:00
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
struct bfd_link_hash_entry *bh = NULL;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
2003-08-04 17:39:46 +08:00
|
|
|
|
(info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s, 0, NULL,
|
|
|
|
|
FALSE, get_elf_backend_data (abfd)->collect, &bh)))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
2002-10-11 16:33:11 +08:00
|
|
|
|
h = (struct elf_link_hash_entry *) bh;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
h->type = STT_OBJECT;
|
|
|
|
|
|
2003-05-30 23:50:12 +08:00
|
|
|
|
if (! info->executable
|
1999-05-03 15:29:11 +08:00
|
|
|
|
&& ! _bfd_elf_link_record_dynamic_symbol (info, h))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-01-04 06:53:39 +08:00
|
|
|
|
s = bfd_make_section (abfd,
|
1999-06-02 21:01:04 +08:00
|
|
|
|
bed->default_use_rela_p ? ".rela.plt" : ".rel.plt");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (! _bfd_elf_create_got_section (abfd, info))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
1999-07-14 02:31:17 +08:00
|
|
|
|
if (bed->want_dynbss)
|
|
|
|
|
{
|
|
|
|
|
/* The .dynbss section is a place to put symbols which are defined
|
|
|
|
|
by dynamic objects, are referenced by regular objects, and are
|
|
|
|
|
not functions. We must allocate space for them in the process
|
|
|
|
|
image and use a R_*_COPY reloc to tell the dynamic linker to
|
|
|
|
|
initialize them at run time. The linker script puts the .dynbss
|
|
|
|
|
section into the .bss section of the final image. */
|
|
|
|
|
s = bfd_make_section (abfd, ".dynbss");
|
|
|
|
|
if (s == NULL
|
2003-08-06 09:27:11 +08:00
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, SEC_ALLOC | SEC_LINKER_CREATED))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
1999-07-14 02:31:17 +08:00
|
|
|
|
/* The .rel[a].bss section holds copy relocs. This section is not
|
1999-05-03 15:29:11 +08:00
|
|
|
|
normally needed. We need to create it here, though, so that the
|
|
|
|
|
linker will map it to an output section. We can't just create it
|
|
|
|
|
only if we need it, because we will not know whether we need it
|
|
|
|
|
until we have seen all the input files, and the first time the
|
|
|
|
|
main linker code calls BFD after examining all the input files
|
|
|
|
|
(size_dynamic_sections) the input sections have already been
|
|
|
|
|
mapped to the output sections. If the section turns out not to
|
|
|
|
|
be needed, we can discard it later. We will never need this
|
|
|
|
|
section when generating a shared object, since they do not use
|
|
|
|
|
copy relocs. */
|
1999-07-14 02:31:17 +08:00
|
|
|
|
if (! info->shared)
|
|
|
|
|
{
|
2001-01-04 06:53:39 +08:00
|
|
|
|
s = bfd_make_section (abfd,
|
|
|
|
|
(bed->default_use_rela_p
|
|
|
|
|
? ".rela.bss" : ".rel.bss"));
|
1999-07-14 02:31:17 +08:00
|
|
|
|
if (s == NULL
|
|
|
|
|
|| ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-07-14 02:31:17 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Record a new dynamic symbol. We record the dynamic symbols as we
|
|
|
|
|
read the input files, since we need to have a list of all of them
|
|
|
|
|
before we can determine the final sizes of the output sections.
|
|
|
|
|
Note that we may actually call this function even though we are not
|
|
|
|
|
going to output any dynamic symbols; in some cases we know that a
|
|
|
|
|
symbol should be in the dynamic symbol table, but only if there is
|
|
|
|
|
one. */
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_record_dynamic_symbol (struct bfd_link_info *info,
|
|
|
|
|
struct elf_link_hash_entry *h)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (h->dynindx == -1)
|
|
|
|
|
{
|
* Makefile.am (BFD32_BACKENDS): Add elf-strtab.lo.
(BFD32_BACKENDS_CFILES): Add elf-strtab.c.
(elf-strtab.lo): Add rule.
* Makefile.in: Rebuilt.
* configure.in (elf): Add elf-strtab.lo.
* configure: Rebuilt.
* elf-bfd.h (elf_strtab_hash): Forward declare.
(struct elf_link_hash_table): Change dynstr type to
struct elf_strtab_hash *.
(struct elf_obj_tdata): Change strtab_ptr type to
struct elf_strtab_hash *.
(_bfd_elf_strtab_init, _bfd_elf_strtab_free, _bfd_elf_strtab_add,
_bfd_elf_strtab_addref, _bfd_elf_strtab_delref,
_bfd_elf_strtab_clear_all_refs, _bfd_elf_strtab_size,
_bfd_elf_strtab_offset, _bfd_elf_strtab_emit,
_bfd_elf_strtab_finalize): New prototypes.
* elf-strtab.c: New file.
* elflink.h (elf_link_add_object_symbols): Use _bfd_elf_strtab_add
and _bfd_elf_strtab_size instead of _bfd_stringtab calls.
Call _bfd_elf_strtab_delref if DT_NEEDED entry is not needed or
when forcing dynamic symbol to local.
(elf_link_create_dynamic_sections): Call
_bfd_elf_strtab_init instead of elf_stringtab_init.
(elf_link_record_local_dynamic_symbol): Likewise, change
dynstr type. Use _bfd_elf_strtab functions instead of
_bfd_stringtab calls.
(size_dynamic_sections): Use _bfd_elf_strtab functions instead of
_bfd_stringtab calls. For DT_RUNPATH and Verdaux vda_name fields,
call _bfd_elf_strtab_addref. Call elf_finalize_dynstr.
(elf_adjust_dynstr_offsets, elf_finalize_dynstr): New functions.
(elf_fix_symbol_flags): Call _bfd_elf_strtab_delref when forcing
dynamic symbol to local.
(elf_link_assign_sym_version): Likewise.
(elf_bfd_final_link): Call _bfd_elf_strtab_emit instead of
_bfd_stringtab_emit.
* elflink.c (_bfd_elf_link_record_dynamic_symbol): Change dynstr
type. Call _bfd_elf_strtab functions instead of
_bfd_stringtab functions.
* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Likewise.
* elf.c (_bfd_elf_init_reloc_shdr): Likewise.
(elf_fake_sections): Likewise.
(assign_section_numbers): Call _bfd_elf_strtab_clear_all_refs
on shstrtab hash table, call _bfd_elf_strtab_addref on each section
name in the output. Call _bfd_elf_strtab_finalize and
use _bfd_elf_strtab_offset to finalize sh_name section header fields.
(_bfd_elf_compute_section_file_positions): Use _bfd_elf_strtab_size
instead of _bfd_stringtab_size.
(prep_headers): Change shstrtab type.
Use _bfd_elf_strtab calls instead of _bfd_stringtab calls.
2001-11-08 00:50:38 +08:00
|
|
|
|
struct elf_strtab_hash *dynstr;
|
2003-10-30 22:13:50 +08:00
|
|
|
|
char *p;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
const char *name;
|
|
|
|
|
bfd_size_type indx;
|
|
|
|
|
|
2000-01-04 02:32:21 +08:00
|
|
|
|
/* XXX: The ABI draft says the linker must turn hidden and
|
|
|
|
|
internal symbols into STB_LOCAL symbols when producing the
|
|
|
|
|
DSO. However, if ld.so honors st_other in the dynamic table,
|
|
|
|
|
this would not be necessary. */
|
|
|
|
|
switch (ELF_ST_VISIBILITY (h->other))
|
|
|
|
|
{
|
|
|
|
|
case STV_INTERNAL:
|
|
|
|
|
case STV_HIDDEN:
|
2000-06-06 04:46:21 +08:00
|
|
|
|
if (h->root.type != bfd_link_hash_undefined
|
|
|
|
|
&& h->root.type != bfd_link_hash_undefweak)
|
2000-05-31 04:51:36 +08:00
|
|
|
|
{
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
2000-01-04 02:32:21 +08:00
|
|
|
|
}
|
2000-05-04 14:38:33 +08:00
|
|
|
|
|
2000-01-04 02:32:21 +08:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
h->dynindx = elf_hash_table (info)->dynsymcount;
|
|
|
|
|
++elf_hash_table (info)->dynsymcount;
|
|
|
|
|
|
|
|
|
|
dynstr = elf_hash_table (info)->dynstr;
|
|
|
|
|
if (dynstr == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Create a strtab to hold the dynamic symbol names. */
|
* Makefile.am (BFD32_BACKENDS): Add elf-strtab.lo.
(BFD32_BACKENDS_CFILES): Add elf-strtab.c.
(elf-strtab.lo): Add rule.
* Makefile.in: Rebuilt.
* configure.in (elf): Add elf-strtab.lo.
* configure: Rebuilt.
* elf-bfd.h (elf_strtab_hash): Forward declare.
(struct elf_link_hash_table): Change dynstr type to
struct elf_strtab_hash *.
(struct elf_obj_tdata): Change strtab_ptr type to
struct elf_strtab_hash *.
(_bfd_elf_strtab_init, _bfd_elf_strtab_free, _bfd_elf_strtab_add,
_bfd_elf_strtab_addref, _bfd_elf_strtab_delref,
_bfd_elf_strtab_clear_all_refs, _bfd_elf_strtab_size,
_bfd_elf_strtab_offset, _bfd_elf_strtab_emit,
_bfd_elf_strtab_finalize): New prototypes.
* elf-strtab.c: New file.
* elflink.h (elf_link_add_object_symbols): Use _bfd_elf_strtab_add
and _bfd_elf_strtab_size instead of _bfd_stringtab calls.
Call _bfd_elf_strtab_delref if DT_NEEDED entry is not needed or
when forcing dynamic symbol to local.
(elf_link_create_dynamic_sections): Call
_bfd_elf_strtab_init instead of elf_stringtab_init.
(elf_link_record_local_dynamic_symbol): Likewise, change
dynstr type. Use _bfd_elf_strtab functions instead of
_bfd_stringtab calls.
(size_dynamic_sections): Use _bfd_elf_strtab functions instead of
_bfd_stringtab calls. For DT_RUNPATH and Verdaux vda_name fields,
call _bfd_elf_strtab_addref. Call elf_finalize_dynstr.
(elf_adjust_dynstr_offsets, elf_finalize_dynstr): New functions.
(elf_fix_symbol_flags): Call _bfd_elf_strtab_delref when forcing
dynamic symbol to local.
(elf_link_assign_sym_version): Likewise.
(elf_bfd_final_link): Call _bfd_elf_strtab_emit instead of
_bfd_stringtab_emit.
* elflink.c (_bfd_elf_link_record_dynamic_symbol): Change dynstr
type. Call _bfd_elf_strtab functions instead of
_bfd_stringtab functions.
* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Likewise.
* elf.c (_bfd_elf_init_reloc_shdr): Likewise.
(elf_fake_sections): Likewise.
(assign_section_numbers): Call _bfd_elf_strtab_clear_all_refs
on shstrtab hash table, call _bfd_elf_strtab_addref on each section
name in the output. Call _bfd_elf_strtab_finalize and
use _bfd_elf_strtab_offset to finalize sh_name section header fields.
(_bfd_elf_compute_section_file_positions): Use _bfd_elf_strtab_size
instead of _bfd_stringtab_size.
(prep_headers): Change shstrtab type.
Use _bfd_elf_strtab calls instead of _bfd_stringtab calls.
2001-11-08 00:50:38 +08:00
|
|
|
|
elf_hash_table (info)->dynstr = dynstr = _bfd_elf_strtab_init ();
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (dynstr == NULL)
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We don't put any version information in the dynamic string
|
2003-02-24 12:50:04 +08:00
|
|
|
|
table. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
name = h->root.root.string;
|
|
|
|
|
p = strchr (name, ELF_VER_CHR);
|
2003-10-30 22:13:50 +08:00
|
|
|
|
if (p != NULL)
|
|
|
|
|
/* We know that the p points into writable memory. In fact,
|
|
|
|
|
there are only a few symbols that have read-only names, being
|
|
|
|
|
those like _GLOBAL_OFFSET_TABLE_ that are created specially
|
|
|
|
|
by the backends. Most symbols will have names pointing into
|
|
|
|
|
an ELF string table read from a file, or to objalloc memory. */
|
|
|
|
|
*p = 0;
|
|
|
|
|
|
|
|
|
|
indx = _bfd_elf_strtab_add (dynstr, name, p != NULL);
|
|
|
|
|
|
|
|
|
|
if (p != NULL)
|
|
|
|
|
*p = ELF_VER_CHR;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (indx == (bfd_size_type) -1)
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
h->dynstr_index = indx;
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
/* Record an assignment to a symbol made by a linker script. We need
|
|
|
|
|
this in case some dynamic object refers to this symbol. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
bfd_elf_record_link_assignment (bfd *output_bfd ATTRIBUTE_UNUSED,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
const char *name,
|
|
|
|
|
bfd_boolean provide)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
2003-12-01 14:28:24 +08:00
|
|
|
|
if (!is_elf_hash_table (info->hash))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
h = elf_link_hash_lookup (elf_hash_table (info), name, TRUE, TRUE, FALSE);
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
2004-03-04 05:31:10 +08:00
|
|
|
|
/* Since we're defining the symbol, don't let it seem to have not
|
|
|
|
|
been defined. record_dynamic_symbol and size_dynamic_sections
|
|
|
|
|
may depend on this. */
|
|
|
|
|
if (h->root.type == bfd_link_hash_undefweak
|
|
|
|
|
|| h->root.type == bfd_link_hash_undefined)
|
|
|
|
|
h->root.type = bfd_link_hash_new;
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (h->root.type == bfd_link_hash_new)
|
|
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_NON_ELF;
|
|
|
|
|
|
|
|
|
|
/* If this symbol is being provided by the linker script, and it is
|
|
|
|
|
currently defined by a dynamic object, but not by a regular
|
|
|
|
|
object, then mark it as undefined so that the generic linker will
|
|
|
|
|
force the correct value. */
|
|
|
|
|
if (provide
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
|
h->root.type = bfd_link_hash_undefined;
|
|
|
|
|
|
|
|
|
|
/* If this symbol is not being provided by the linker script, and it is
|
|
|
|
|
currently defined by a dynamic object, but not by a regular object,
|
|
|
|
|
then clear out any version information because the symbol will not be
|
|
|
|
|
associated with the dynamic object any more. */
|
|
|
|
|
if (!provide
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
|
h->verinfo.verdef = NULL;
|
|
|
|
|
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
|
|
|
|
|
if (((h->elf_link_hash_flags & (ELF_LINK_HASH_DEF_DYNAMIC
|
|
|
|
|
| ELF_LINK_HASH_REF_DYNAMIC)) != 0
|
|
|
|
|
|| info->shared)
|
|
|
|
|
&& h->dynindx == -1)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* If this is a weak defined symbol, and we know a corresponding
|
|
|
|
|
real symbol from the same dynamic object, make sure the real
|
|
|
|
|
symbol is also made into a dynamic symbol. */
|
|
|
|
|
if (h->weakdef != NULL
|
|
|
|
|
&& h->weakdef->dynindx == -1)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info, h->weakdef))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
1999-06-13 22:49:51 +08:00
|
|
|
|
|
2002-07-25 14:54:51 +08:00
|
|
|
|
/* Record a new local dynamic symbol. Returns 0 on failure, 1 on
|
|
|
|
|
success, and 2 on a failure caused by attempting to record a symbol
|
|
|
|
|
in a discarded section, eg. a discarded link-once section symbol. */
|
|
|
|
|
|
|
|
|
|
int
|
2003-08-04 17:39:46 +08:00
|
|
|
|
elf_link_record_local_dynamic_symbol (struct bfd_link_info *info,
|
|
|
|
|
bfd *input_bfd,
|
|
|
|
|
long input_indx)
|
2002-07-25 14:54:51 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
struct elf_link_local_dynamic_entry *entry;
|
|
|
|
|
struct elf_link_hash_table *eht;
|
|
|
|
|
struct elf_strtab_hash *dynstr;
|
|
|
|
|
unsigned long dynstr_index;
|
|
|
|
|
char *name;
|
|
|
|
|
Elf_External_Sym_Shndx eshndx;
|
|
|
|
|
char esym[sizeof (Elf64_External_Sym)];
|
|
|
|
|
|
2003-12-01 14:28:24 +08:00
|
|
|
|
if (! is_elf_hash_table (info->hash))
|
2002-07-25 14:54:51 +08:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* See if the entry exists already. */
|
|
|
|
|
for (entry = elf_hash_table (info)->dynlocal; entry ; entry = entry->next)
|
|
|
|
|
if (entry->input_bfd == input_bfd && entry->input_indx == input_indx)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
amt = sizeof (*entry);
|
2003-08-04 17:39:46 +08:00
|
|
|
|
entry = bfd_alloc (input_bfd, amt);
|
2002-07-25 14:54:51 +08:00
|
|
|
|
if (entry == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Go find the symbol, so that we can find it's name. */
|
|
|
|
|
if (!bfd_elf_get_elf_syms (input_bfd, &elf_tdata (input_bfd)->symtab_hdr,
|
2003-08-04 17:39:46 +08:00
|
|
|
|
1, input_indx, &entry->isym, esym, &eshndx))
|
2002-07-25 14:54:51 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_release (input_bfd, entry);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (entry->isym.st_shndx != SHN_UNDEF
|
|
|
|
|
&& (entry->isym.st_shndx < SHN_LORESERVE
|
|
|
|
|
|| entry->isym.st_shndx > SHN_HIRESERVE))
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
|
|
|
|
|
s = bfd_section_from_elf_index (input_bfd, entry->isym.st_shndx);
|
|
|
|
|
if (s == NULL || bfd_is_abs_section (s->output_section))
|
|
|
|
|
{
|
|
|
|
|
/* We can still bfd_release here as nothing has done another
|
|
|
|
|
bfd_alloc. We can't do this later in this function. */
|
|
|
|
|
bfd_release (input_bfd, entry);
|
|
|
|
|
return 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
name = (bfd_elf_string_from_elf_section
|
|
|
|
|
(input_bfd, elf_tdata (input_bfd)->symtab_hdr.sh_link,
|
|
|
|
|
entry->isym.st_name));
|
|
|
|
|
|
|
|
|
|
dynstr = elf_hash_table (info)->dynstr;
|
|
|
|
|
if (dynstr == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Create a strtab to hold the dynamic symbol names. */
|
|
|
|
|
elf_hash_table (info)->dynstr = dynstr = _bfd_elf_strtab_init ();
|
|
|
|
|
if (dynstr == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
dynstr_index = _bfd_elf_strtab_add (dynstr, name, FALSE);
|
2002-07-25 14:54:51 +08:00
|
|
|
|
if (dynstr_index == (unsigned long) -1)
|
|
|
|
|
return 0;
|
|
|
|
|
entry->isym.st_name = dynstr_index;
|
|
|
|
|
|
|
|
|
|
eht = elf_hash_table (info);
|
|
|
|
|
|
|
|
|
|
entry->next = eht->dynlocal;
|
|
|
|
|
eht->dynlocal = entry;
|
|
|
|
|
entry->input_bfd = input_bfd;
|
|
|
|
|
entry->input_indx = input_indx;
|
|
|
|
|
eht->dynsymcount++;
|
|
|
|
|
|
|
|
|
|
/* Whatever binding the symbol had before, it's now local. */
|
|
|
|
|
entry->isym.st_info
|
|
|
|
|
= ELF_ST_INFO (STB_LOCAL, ELF_ST_TYPE (entry->isym.st_info));
|
|
|
|
|
|
|
|
|
|
/* The dynindx will be set at the end of size_dynamic_sections. */
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
1999-07-14 02:21:29 +08:00
|
|
|
|
/* Return the dynindex of a local dynamic symbol. */
|
1999-06-13 22:49:51 +08:00
|
|
|
|
|
1999-07-14 02:21:29 +08:00
|
|
|
|
long
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_lookup_local_dynindx (struct bfd_link_info *info,
|
|
|
|
|
bfd *input_bfd,
|
|
|
|
|
long input_indx)
|
1999-07-14 02:21:29 +08:00
|
|
|
|
{
|
|
|
|
|
struct elf_link_local_dynamic_entry *e;
|
|
|
|
|
|
|
|
|
|
for (e = elf_hash_table (info)->dynlocal; e ; e = e->next)
|
|
|
|
|
if (e->input_bfd == input_bfd && e->input_indx == input_indx)
|
|
|
|
|
return e->dynindx;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is used to renumber the dynamic symbols, if some of
|
|
|
|
|
them are removed because they are marked as local. This is called
|
|
|
|
|
via elf_link_hash_traverse. */
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
static bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
elf_link_renumber_hash_table_dynsyms (struct elf_link_hash_entry *h,
|
|
|
|
|
void *data)
|
1999-06-13 22:49:51 +08:00
|
|
|
|
{
|
2003-08-04 17:39:46 +08:00
|
|
|
|
size_t *count = data;
|
1999-07-14 02:21:29 +08:00
|
|
|
|
|
2002-03-28 11:27:46 +08:00
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
1999-06-13 22:49:51 +08:00
|
|
|
|
if (h->dynindx != -1)
|
1999-07-14 02:21:29 +08:00
|
|
|
|
h->dynindx = ++(*count);
|
|
|
|
|
|
2002-11-30 16:39:46 +08:00
|
|
|
|
return TRUE;
|
1999-06-13 22:49:51 +08:00
|
|
|
|
}
|
1999-07-14 02:21:29 +08:00
|
|
|
|
|
2001-05-07 17:15:26 +08:00
|
|
|
|
/* Assign dynsym indices. In a shared library we generate a section
|
1999-07-14 02:21:29 +08:00
|
|
|
|
symbol for each output section, which come first. Next come all of
|
|
|
|
|
the back-end allocated local dynamic syms, followed by the rest of
|
|
|
|
|
the global symbols. */
|
|
|
|
|
|
|
|
|
|
unsigned long
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_renumber_dynsyms (bfd *output_bfd, struct bfd_link_info *info)
|
1999-07-14 02:21:29 +08:00
|
|
|
|
{
|
|
|
|
|
unsigned long dynsymcount = 0;
|
|
|
|
|
|
|
|
|
|
if (info->shared)
|
|
|
|
|
{
|
|
|
|
|
asection *p;
|
|
|
|
|
for (p = output_bfd->sections; p ; p = p->next)
|
2002-07-04 22:40:25 +08:00
|
|
|
|
if ((p->flags & SEC_EXCLUDE) == 0)
|
|
|
|
|
elf_section_data (p)->dynindx = ++dynsymcount;
|
1999-07-14 02:21:29 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynlocal)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_local_dynamic_entry *p;
|
|
|
|
|
for (p = elf_hash_table (info)->dynlocal; p ; p = p->next)
|
|
|
|
|
p->dynindx = ++dynsymcount;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
elf_link_renumber_hash_table_dynsyms,
|
|
|
|
|
&dynsymcount);
|
|
|
|
|
|
|
|
|
|
/* There is an unused NULL entry at the head of the table which
|
|
|
|
|
we must account for in our count. Unless there weren't any
|
|
|
|
|
symbols, which means we'll have no table at all. */
|
|
|
|
|
if (dynsymcount != 0)
|
|
|
|
|
++dynsymcount;
|
|
|
|
|
|
|
|
|
|
return elf_hash_table (info)->dynsymcount = dynsymcount;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* This function is called when we want to define a new symbol. It
|
|
|
|
|
handles the various cases which arise when we find a definition in
|
|
|
|
|
a dynamic object, or when there is already a definition in a
|
|
|
|
|
dynamic object. The new symbol is described by NAME, SYM, PSEC,
|
|
|
|
|
and PVALUE. We set SYM_HASH to the hash table entry. We set
|
|
|
|
|
OVERRIDE if the old symbol is overriding a new definition. We set
|
|
|
|
|
TYPE_CHANGE_OK if it is OK for the type to change. We set
|
|
|
|
|
SIZE_CHANGE_OK if it is OK for the size to change. By OK to
|
|
|
|
|
change, we mean that we shouldn't warn if the type or size does
|
2004-03-19 09:36:45 +08:00
|
|
|
|
change. */
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_merge_symbol (bfd *abfd,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
const char *name,
|
|
|
|
|
Elf_Internal_Sym *sym,
|
|
|
|
|
asection **psec,
|
|
|
|
|
bfd_vma *pvalue,
|
|
|
|
|
struct elf_link_hash_entry **sym_hash,
|
|
|
|
|
bfd_boolean *skip,
|
|
|
|
|
bfd_boolean *override,
|
|
|
|
|
bfd_boolean *type_change_ok,
|
2004-03-19 09:36:45 +08:00
|
|
|
|
bfd_boolean *size_change_ok)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
asection *sec;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
struct elf_link_hash_entry *flip;
|
|
|
|
|
int bind;
|
|
|
|
|
bfd *oldbfd;
|
|
|
|
|
bfd_boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
|
2004-03-18 12:32:17 +08:00
|
|
|
|
bfd_boolean newweak, oldweak;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
*skip = FALSE;
|
|
|
|
|
*override = FALSE;
|
|
|
|
|
|
|
|
|
|
sec = *psec;
|
|
|
|
|
bind = ELF_ST_BIND (sym->st_info);
|
|
|
|
|
|
|
|
|
|
if (! bfd_is_und_section (sec))
|
|
|
|
|
h = elf_link_hash_lookup (elf_hash_table (info), name, TRUE, FALSE, FALSE);
|
|
|
|
|
else
|
|
|
|
|
h = ((struct elf_link_hash_entry *)
|
|
|
|
|
bfd_wrapped_link_hash_lookup (abfd, info, name, TRUE, FALSE, FALSE));
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
*sym_hash = h;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* This code is for coping with dynamic objects, and is only useful
|
|
|
|
|
if we are doing an ELF link. */
|
|
|
|
|
if (info->hash->creator != abfd->xvec)
|
|
|
|
|
return TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* For merging, we only care about real symbols. */
|
|
|
|
|
|
|
|
|
|
while (h->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
/* If we just created the symbol, mark it as being an ELF symbol.
|
|
|
|
|
Other than that, there is nothing to do--there is no merge issue
|
|
|
|
|
with a newly defined symbol--so we just return. */
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_new)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* OLDBFD is a BFD associated with the existing symbol. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
switch (h->root.type)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
oldbfd = NULL;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
case bfd_link_hash_undefined:
|
|
|
|
|
case bfd_link_hash_undefweak:
|
|
|
|
|
oldbfd = h->root.u.undef.abfd;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_link_hash_defined:
|
|
|
|
|
case bfd_link_hash_defweak:
|
|
|
|
|
oldbfd = h->root.u.def.section->owner;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_link_hash_common:
|
|
|
|
|
oldbfd = h->root.u.c.p->section->owner;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* In cases involving weak versioned symbols, we may wind up trying
|
|
|
|
|
to merge a symbol with itself. Catch that here, to avoid the
|
|
|
|
|
confusion that results if we try to override a symbol with
|
|
|
|
|
itself. The additional tests catch cases like
|
|
|
|
|
_GLOBAL_OFFSET_TABLE_, which are regular symbols defined in a
|
|
|
|
|
dynamic object, which we do want to handle here. */
|
|
|
|
|
if (abfd == oldbfd
|
|
|
|
|
&& ((abfd->flags & DYNAMIC) == 0
|
|
|
|
|
|| (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* NEWDYN and OLDDYN indicate whether the new or old symbol,
|
|
|
|
|
respectively, is from a dynamic object. */
|
|
|
|
|
|
|
|
|
|
if ((abfd->flags & DYNAMIC) != 0)
|
|
|
|
|
newdyn = TRUE;
|
|
|
|
|
else
|
|
|
|
|
newdyn = FALSE;
|
|
|
|
|
|
|
|
|
|
if (oldbfd != NULL)
|
|
|
|
|
olddyn = (oldbfd->flags & DYNAMIC) != 0;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
asection *hsec;
|
|
|
|
|
|
|
|
|
|
/* This code handles the special SHN_MIPS_{TEXT,DATA} section
|
|
|
|
|
indices used by MIPS ELF. */
|
|
|
|
|
switch (h->root.type)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
default:
|
|
|
|
|
hsec = NULL;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
case bfd_link_hash_defined:
|
|
|
|
|
case bfd_link_hash_defweak:
|
|
|
|
|
hsec = h->root.u.def.section;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
case bfd_link_hash_common:
|
|
|
|
|
hsec = h->root.u.c.p->section;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (hsec == NULL)
|
|
|
|
|
olddyn = FALSE;
|
|
|
|
|
else
|
|
|
|
|
olddyn = (hsec->symbol->flags & BSF_DYNAMIC) != 0;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* NEWDEF and OLDDEF indicate whether the new or old symbol,
|
|
|
|
|
respectively, appear to be a definition rather than reference. */
|
|
|
|
|
|
|
|
|
|
if (bfd_is_und_section (sec) || bfd_is_com_section (sec))
|
|
|
|
|
newdef = FALSE;
|
|
|
|
|
else
|
|
|
|
|
newdef = TRUE;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_undefined
|
|
|
|
|
|| h->root.type == bfd_link_hash_undefweak
|
|
|
|
|
|| h->root.type == bfd_link_hash_common)
|
|
|
|
|
olddef = FALSE;
|
|
|
|
|
else
|
|
|
|
|
olddef = TRUE;
|
|
|
|
|
|
2003-11-28 02:49:39 +08:00
|
|
|
|
/* We need to remember if a symbol has a definition in a dynamic
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
object or is weak in all dynamic objects. Internal and hidden
|
|
|
|
|
visibility will make it unavailable to dynamic objects. */
|
|
|
|
|
if (newdyn && (h->elf_link_hash_flags & ELF_LINK_DYNAMIC_DEF) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (!bfd_is_und_section (sec))
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_DYNAMIC_DEF;
|
|
|
|
|
else
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* Check if this symbol is weak in all dynamic objects. If it
|
|
|
|
|
is the first time we see it in a dynamic object, we mark
|
|
|
|
|
if it is weak. Otherwise, we clear it. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0)
|
2004-03-18 12:32:17 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (bind == STB_WEAK)
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_DYNAMIC_WEAK;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
else if (bind != STB_WEAK)
|
|
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_DYNAMIC_WEAK;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* If the old symbol has non-default visibility, we ignore the new
|
|
|
|
|
definition from a dynamic object. */
|
|
|
|
|
if (newdyn
|
2003-05-17 14:16:03 +08:00
|
|
|
|
&& ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& !bfd_is_und_section (sec))
|
|
|
|
|
{
|
|
|
|
|
*skip = TRUE;
|
|
|
|
|
/* Make sure this symbol is dynamic. */
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_REF_DYNAMIC;
|
|
|
|
|
/* A protected symbol has external availability. Make sure it is
|
|
|
|
|
recorded as dynamic.
|
|
|
|
|
|
|
|
|
|
FIXME: Should we check type and size for protected symbol? */
|
|
|
|
|
if (ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
|
|
|
|
|
return _bfd_elf_link_record_dynamic_symbol (info, h);
|
|
|
|
|
else
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
else if (!newdyn
|
2003-05-17 14:16:03 +08:00
|
|
|
|
&& ELF_ST_VISIBILITY (sym->st_other) != STV_DEFAULT
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* If the new symbol with non-default visibility comes from a
|
|
|
|
|
relocatable file and the old definition comes from a dynamic
|
|
|
|
|
object, we remove the old definition. */
|
|
|
|
|
if ((*sym_hash)->root.type == bfd_link_hash_indirect)
|
|
|
|
|
h = *sym_hash;
|
2004-02-22 07:05:13 +08:00
|
|
|
|
|
|
|
|
|
if ((h->root.und_next || info->hash->undefs_tail == &h->root)
|
|
|
|
|
&& bfd_is_und_section (sec))
|
|
|
|
|
{
|
|
|
|
|
/* If the new symbol is undefined and the old symbol was
|
|
|
|
|
also undefined before, we need to make sure
|
|
|
|
|
_bfd_generic_link_add_one_symbol doesn't mess
|
|
|
|
|
up the linker hash table undefs list. Since the old
|
|
|
|
|
definition came from a dynamic object, it is still on the
|
|
|
|
|
undefs list. */
|
|
|
|
|
h->root.type = bfd_link_hash_undefined;
|
|
|
|
|
/* FIXME: What if the new symbol is weak undefined? */
|
|
|
|
|
h->root.u.undef.abfd = abfd;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
h->root.type = bfd_link_hash_new;
|
|
|
|
|
h->root.u.undef.abfd = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_HASH_DEF_DYNAMIC;
|
2003-05-20 22:35:01 +08:00
|
|
|
|
h->elf_link_hash_flags |= (ELF_LINK_HASH_REF_DYNAMIC
|
|
|
|
|
| ELF_LINK_DYNAMIC_DEF);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
|
|
|
|
/* FIXME: Should we check type and size for protected symbol? */
|
|
|
|
|
h->size = 0;
|
|
|
|
|
h->type = 0;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
2002-10-11 16:33:11 +08:00
|
|
|
|
|
2004-03-18 12:32:17 +08:00
|
|
|
|
/* Differentiate strong and weak symbols. */
|
|
|
|
|
newweak = bind == STB_WEAK;
|
|
|
|
|
oldweak = (h->root.type == bfd_link_hash_defweak
|
|
|
|
|
|| h->root.type == bfd_link_hash_undefweak);
|
2002-10-11 16:33:11 +08:00
|
|
|
|
|
2004-03-19 09:36:45 +08:00
|
|
|
|
/* If a new weak symbol comes from a regular file and the old symbol
|
|
|
|
|
comes from a dynamic library, we treat the new one as strong.
|
|
|
|
|
Similarly, an old weak symbol from a regular file is treated as
|
|
|
|
|
strong when the new symbol comes from a dynamic library. Further,
|
|
|
|
|
an old weak symbol from a dynamic library is treated as strong if
|
|
|
|
|
the new symbol is from a dynamic library. This reflects the way
|
|
|
|
|
glibc's ld.so works. */
|
|
|
|
|
if (!newdyn && olddyn)
|
|
|
|
|
newweak = FALSE;
|
|
|
|
|
if (newdyn)
|
|
|
|
|
oldweak = FALSE;
|
|
|
|
|
|
2004-03-18 12:32:17 +08:00
|
|
|
|
/* It's OK to change the type if either the existing symbol or the
|
|
|
|
|
new symbol is weak. A type change is also OK if the old symbol
|
|
|
|
|
is undefined and the new symbol is defined. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-03-18 12:32:17 +08:00
|
|
|
|
if (oldweak
|
|
|
|
|
|| newweak
|
|
|
|
|
|| (newdef
|
|
|
|
|
&& h->root.type == bfd_link_hash_undefined))
|
|
|
|
|
*type_change_ok = TRUE;
|
|
|
|
|
|
|
|
|
|
/* It's OK to change the size if either the existing symbol or the
|
|
|
|
|
new symbol is weak, or if the old symbol is undefined. */
|
|
|
|
|
|
|
|
|
|
if (*type_change_ok
|
|
|
|
|
|| h->root.type == bfd_link_hash_undefined)
|
|
|
|
|
*size_change_ok = TRUE;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
/* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
|
|
|
|
|
symbol, respectively, appears to be a common symbol in a dynamic
|
|
|
|
|
object. If a symbol appears in an uninitialized section, and is
|
|
|
|
|
not weak, and is not a function, then it may be a common symbol
|
|
|
|
|
which was resolved when the dynamic object was created. We want
|
|
|
|
|
to treat such symbols specially, because they raise special
|
|
|
|
|
considerations when setting the symbol size: if the symbol
|
|
|
|
|
appears as a common symbol in a regular object, and the size in
|
|
|
|
|
the regular object is larger, we must make sure that we use the
|
|
|
|
|
larger size. This problematic case can always be avoided in C,
|
|
|
|
|
but it must be handled correctly when using Fortran shared
|
|
|
|
|
libraries.
|
|
|
|
|
|
|
|
|
|
Note that if NEWDYNCOMMON is set, NEWDEF will be set, and
|
|
|
|
|
likewise for OLDDYNCOMMON and OLDDEF.
|
|
|
|
|
|
|
|
|
|
Note that this test is just a heuristic, and that it is quite
|
|
|
|
|
possible to have an uninitialized symbol in a shared object which
|
|
|
|
|
is really a definition, rather than a common symbol. This could
|
|
|
|
|
lead to some minor confusion when the symbol really is a common
|
|
|
|
|
symbol in some regular object. However, I think it will be
|
|
|
|
|
harmless. */
|
|
|
|
|
|
|
|
|
|
if (newdyn
|
|
|
|
|
&& newdef
|
2004-03-18 12:32:17 +08:00
|
|
|
|
&& !newweak
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& (sec->flags & SEC_ALLOC) != 0
|
|
|
|
|
&& (sec->flags & SEC_LOAD) == 0
|
|
|
|
|
&& sym->st_size > 0
|
|
|
|
|
&& ELF_ST_TYPE (sym->st_info) != STT_FUNC)
|
|
|
|
|
newdyncommon = TRUE;
|
|
|
|
|
else
|
|
|
|
|
newdyncommon = FALSE;
|
|
|
|
|
|
|
|
|
|
if (olddyn
|
|
|
|
|
&& olddef
|
|
|
|
|
&& h->root.type == bfd_link_hash_defined
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
|
|
|
|
|
&& (h->root.u.def.section->flags & SEC_ALLOC) != 0
|
|
|
|
|
&& (h->root.u.def.section->flags & SEC_LOAD) == 0
|
|
|
|
|
&& h->size > 0
|
|
|
|
|
&& h->type != STT_FUNC)
|
|
|
|
|
olddyncommon = TRUE;
|
|
|
|
|
else
|
|
|
|
|
olddyncommon = FALSE;
|
|
|
|
|
|
|
|
|
|
/* If both the old and the new symbols look like common symbols in a
|
|
|
|
|
dynamic object, set the size of the symbol to the larger of the
|
|
|
|
|
two. */
|
|
|
|
|
|
|
|
|
|
if (olddyncommon
|
|
|
|
|
&& newdyncommon
|
|
|
|
|
&& sym->st_size != h->size)
|
|
|
|
|
{
|
|
|
|
|
/* Since we think we have two common symbols, issue a multiple
|
|
|
|
|
common warning if desired. Note that we only warn if the
|
|
|
|
|
size is different. If the size is the same, we simply let
|
|
|
|
|
the old symbol override the new one as normally happens with
|
|
|
|
|
symbols defined in dynamic objects. */
|
|
|
|
|
|
|
|
|
|
if (! ((*info->callbacks->multiple_common)
|
|
|
|
|
(info, h->root.root.string, oldbfd, bfd_link_hash_common,
|
|
|
|
|
h->size, abfd, bfd_link_hash_common, sym->st_size)))
|
|
|
|
|
return FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (sym->st_size > h->size)
|
|
|
|
|
h->size = sym->st_size;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
*size_change_ok = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* If we are looking at a dynamic object, and we have found a
|
|
|
|
|
definition, we need to see if the symbol was already defined by
|
|
|
|
|
some other object. If so, we want to use the existing
|
|
|
|
|
definition, and we do not want to report a multiple symbol
|
|
|
|
|
definition error; we do this by clobbering *PSEC to be
|
|
|
|
|
bfd_und_section_ptr.
|
|
|
|
|
|
|
|
|
|
We treat a common symbol as a definition if the symbol in the
|
|
|
|
|
shared library is a function, since common symbols always
|
|
|
|
|
represent variables; this can cause confusion in principle, but
|
|
|
|
|
any such confusion would seem to indicate an erroneous program or
|
|
|
|
|
shared library. We also permit a common symbol in a regular
|
2004-03-18 12:32:17 +08:00
|
|
|
|
object to override a weak symbol in a shared object. */
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
if (newdyn
|
|
|
|
|
&& newdef
|
|
|
|
|
&& (olddef
|
|
|
|
|
|| (h->root.type == bfd_link_hash_common
|
2004-03-18 12:32:17 +08:00
|
|
|
|
&& (newweak
|
2004-03-19 09:36:45 +08:00
|
|
|
|
|| ELF_ST_TYPE (sym->st_info) == STT_FUNC))))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
*override = TRUE;
|
|
|
|
|
newdef = FALSE;
|
|
|
|
|
newdyncommon = FALSE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
*psec = sec = bfd_und_section_ptr;
|
|
|
|
|
*size_change_ok = TRUE;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* If we get here when the old symbol is a common symbol, then
|
|
|
|
|
we are explicitly letting it override a weak symbol or
|
|
|
|
|
function in a dynamic object, and we don't want to warn about
|
|
|
|
|
a type change. If the old symbol is a defined symbol, a type
|
|
|
|
|
change warning may still be appropriate. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (h->root.type == bfd_link_hash_common)
|
|
|
|
|
*type_change_ok = TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the special case of an old common symbol merging with a
|
|
|
|
|
new symbol which looks like a common symbol in a shared object.
|
|
|
|
|
We change *PSEC and *PVALUE to make the new symbol look like a
|
|
|
|
|
common symbol, and let _bfd_generic_link_add_one_symbol will do
|
|
|
|
|
the right thing. */
|
|
|
|
|
|
|
|
|
|
if (newdyncommon
|
|
|
|
|
&& h->root.type == bfd_link_hash_common)
|
|
|
|
|
{
|
|
|
|
|
*override = TRUE;
|
|
|
|
|
newdef = FALSE;
|
|
|
|
|
newdyncommon = FALSE;
|
|
|
|
|
*pvalue = sym->st_size;
|
|
|
|
|
*psec = sec = bfd_com_section_ptr;
|
|
|
|
|
*size_change_ok = TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the old symbol is from a dynamic object, and the new symbol is
|
|
|
|
|
a definition which is not from a dynamic object, then the new
|
|
|
|
|
symbol overrides the old symbol. Symbols from regular files
|
|
|
|
|
always take precedence over symbols from dynamic objects, even if
|
|
|
|
|
they are defined after the dynamic object in the link.
|
|
|
|
|
|
|
|
|
|
As above, we again permit a common symbol in a regular object to
|
|
|
|
|
override a definition in a shared object if the shared object
|
2004-03-19 09:36:45 +08:00
|
|
|
|
symbol is a function or is weak. */
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
flip = NULL;
|
|
|
|
|
if (! newdyn
|
|
|
|
|
&& (newdef
|
|
|
|
|
|| (bfd_is_com_section (sec)
|
2004-03-18 12:32:17 +08:00
|
|
|
|
&& (oldweak
|
|
|
|
|
|| h->type == STT_FUNC)))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& olddyn
|
|
|
|
|
&& olddef
|
2004-03-19 09:36:45 +08:00
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
/* Change the hash table entry to undefined, and let
|
|
|
|
|
_bfd_generic_link_add_one_symbol do the right thing with the
|
|
|
|
|
new definition. */
|
|
|
|
|
|
|
|
|
|
h->root.type = bfd_link_hash_undefined;
|
|
|
|
|
h->root.u.undef.abfd = h->root.u.def.section->owner;
|
|
|
|
|
*size_change_ok = TRUE;
|
|
|
|
|
|
|
|
|
|
olddef = FALSE;
|
|
|
|
|
olddyncommon = FALSE;
|
|
|
|
|
|
|
|
|
|
/* We again permit a type change when a common symbol may be
|
|
|
|
|
overriding a function. */
|
|
|
|
|
|
|
|
|
|
if (bfd_is_com_section (sec))
|
|
|
|
|
*type_change_ok = TRUE;
|
|
|
|
|
|
|
|
|
|
if ((*sym_hash)->root.type == bfd_link_hash_indirect)
|
|
|
|
|
flip = *sym_hash;
|
|
|
|
|
else
|
|
|
|
|
/* This union may have been set to be non-NULL when this symbol
|
|
|
|
|
was seen in a dynamic object. We must force the union to be
|
|
|
|
|
NULL, so that it is correct for a regular symbol. */
|
|
|
|
|
h->verinfo.vertree = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the special case of a new common symbol merging with an
|
|
|
|
|
old symbol that looks like it might be a common symbol defined in
|
|
|
|
|
a shared object. Note that we have already handled the case in
|
|
|
|
|
which a new common symbol should simply override the definition
|
|
|
|
|
in the shared library. */
|
|
|
|
|
|
|
|
|
|
if (! newdyn
|
|
|
|
|
&& bfd_is_com_section (sec)
|
|
|
|
|
&& olddyncommon)
|
|
|
|
|
{
|
|
|
|
|
/* It would be best if we could set the hash table entry to a
|
|
|
|
|
common symbol, but we don't know what to use for the section
|
|
|
|
|
or the alignment. */
|
|
|
|
|
if (! ((*info->callbacks->multiple_common)
|
|
|
|
|
(info, h->root.root.string, oldbfd, bfd_link_hash_common,
|
|
|
|
|
h->size, abfd, bfd_link_hash_common, sym->st_size)))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
2003-11-28 02:49:39 +08:00
|
|
|
|
/* If the presumed common symbol in the dynamic object is
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
larger, pretend that the new symbol has its size. */
|
|
|
|
|
|
|
|
|
|
if (h->size > *pvalue)
|
|
|
|
|
*pvalue = h->size;
|
|
|
|
|
|
|
|
|
|
/* FIXME: We no longer know the alignment required by the symbol
|
|
|
|
|
in the dynamic object, so we just wind up using the one from
|
|
|
|
|
the regular object. */
|
|
|
|
|
|
|
|
|
|
olddef = FALSE;
|
|
|
|
|
olddyncommon = FALSE;
|
|
|
|
|
|
|
|
|
|
h->root.type = bfd_link_hash_undefined;
|
|
|
|
|
h->root.u.undef.abfd = h->root.u.def.section->owner;
|
|
|
|
|
|
|
|
|
|
*size_change_ok = TRUE;
|
|
|
|
|
*type_change_ok = TRUE;
|
|
|
|
|
|
|
|
|
|
if ((*sym_hash)->root.type == bfd_link_hash_indirect)
|
|
|
|
|
flip = *sym_hash;
|
|
|
|
|
else
|
|
|
|
|
h->verinfo.vertree = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flip != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Handle the case where we had a versioned symbol in a dynamic
|
|
|
|
|
library and now find a definition in a normal object. In this
|
|
|
|
|
case, we make the versioned symbol point to the normal one. */
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
flip->root.type = h->root.type;
|
|
|
|
|
h->root.type = bfd_link_hash_indirect;
|
|
|
|
|
h->root.u.i.link = (struct bfd_link_hash_entry *) flip;
|
|
|
|
|
(*bed->elf_backend_copy_indirect_symbol) (bed, flip, h);
|
|
|
|
|
flip->root.u.undef.abfd = h->root.u.undef.abfd;
|
|
|
|
|
if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)
|
|
|
|
|
{
|
|
|
|
|
h->elf_link_hash_flags &= ~ELF_LINK_HASH_DEF_DYNAMIC;
|
|
|
|
|
flip->elf_link_hash_flags |= ELF_LINK_HASH_REF_DYNAMIC;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This function is called to create an indirect symbol from the
|
|
|
|
|
default for the symbol with the default version if needed. The
|
|
|
|
|
symbol is described by H, NAME, SYM, PSEC, VALUE, and OVERRIDE. We
|
2004-03-19 09:36:45 +08:00
|
|
|
|
set DYNSYM if the new indirect symbol is dynamic. */
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_add_default_symbol (bfd *abfd,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
struct elf_link_hash_entry *h,
|
|
|
|
|
const char *name,
|
|
|
|
|
Elf_Internal_Sym *sym,
|
|
|
|
|
asection **psec,
|
|
|
|
|
bfd_vma *value,
|
|
|
|
|
bfd_boolean *dynsym,
|
2004-03-19 09:36:45 +08:00
|
|
|
|
bfd_boolean override)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_boolean type_change_ok;
|
|
|
|
|
bfd_boolean size_change_ok;
|
|
|
|
|
bfd_boolean skip;
|
|
|
|
|
char *shortname;
|
|
|
|
|
struct elf_link_hash_entry *hi;
|
|
|
|
|
struct bfd_link_hash_entry *bh;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
bfd_boolean collect;
|
|
|
|
|
bfd_boolean dynamic;
|
|
|
|
|
char *p;
|
|
|
|
|
size_t len, shortlen;
|
|
|
|
|
asection *sec;
|
|
|
|
|
|
|
|
|
|
/* If this symbol has a version, and it is the default version, we
|
|
|
|
|
create an indirect symbol from the default name to the fully
|
|
|
|
|
decorated name. This will cause external references which do not
|
|
|
|
|
specify a version to be bound to this version of the symbol. */
|
|
|
|
|
p = strchr (name, ELF_VER_CHR);
|
|
|
|
|
if (p == NULL || p[1] != ELF_VER_CHR)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if (override)
|
|
|
|
|
{
|
2003-11-28 02:49:39 +08:00
|
|
|
|
/* We are overridden by an old definition. We need to check if we
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
need to create the indirect symbol from the default name. */
|
|
|
|
|
hi = elf_link_hash_lookup (elf_hash_table (info), name, TRUE,
|
|
|
|
|
FALSE, FALSE);
|
|
|
|
|
BFD_ASSERT (hi != NULL);
|
|
|
|
|
if (hi == h)
|
|
|
|
|
return TRUE;
|
|
|
|
|
while (hi->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| hi->root.type == bfd_link_hash_warning)
|
|
|
|
|
{
|
|
|
|
|
hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
|
|
|
|
|
if (hi == h)
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
|
collect = bed->collect;
|
|
|
|
|
dynamic = (abfd->flags & DYNAMIC) != 0;
|
|
|
|
|
|
|
|
|
|
shortlen = p - name;
|
|
|
|
|
shortname = bfd_hash_allocate (&info->hash->table, shortlen + 1);
|
|
|
|
|
if (shortname == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
memcpy (shortname, name, shortlen);
|
|
|
|
|
shortname[shortlen] = '\0';
|
|
|
|
|
|
|
|
|
|
/* We are going to create a new symbol. Merge it with any existing
|
|
|
|
|
symbol with this name. For the purposes of the merge, act as
|
|
|
|
|
though we were defining the symbol we just defined, although we
|
|
|
|
|
actually going to define an indirect symbol. */
|
|
|
|
|
type_change_ok = FALSE;
|
|
|
|
|
size_change_ok = FALSE;
|
|
|
|
|
sec = *psec;
|
|
|
|
|
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &sec, value,
|
|
|
|
|
&hi, &skip, &override, &type_change_ok,
|
2004-03-19 09:36:45 +08:00
|
|
|
|
&size_change_ok))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (skip)
|
|
|
|
|
goto nondefault;
|
|
|
|
|
|
|
|
|
|
if (! override)
|
|
|
|
|
{
|
|
|
|
|
bh = &hi->root;
|
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
|
|
|
|
(info, abfd, shortname, BSF_INDIRECT, bfd_ind_section_ptr,
|
2003-08-04 17:39:46 +08:00
|
|
|
|
0, name, FALSE, collect, &bh)))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
hi = (struct elf_link_hash_entry *) bh;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* In this case the symbol named SHORTNAME is overriding the
|
|
|
|
|
indirect symbol we want to add. We were planning on making
|
|
|
|
|
SHORTNAME an indirect symbol referring to NAME. SHORTNAME
|
|
|
|
|
is the name without a version. NAME is the fully versioned
|
|
|
|
|
name, and it is the default version.
|
|
|
|
|
|
|
|
|
|
Overriding means that we already saw a definition for the
|
|
|
|
|
symbol SHORTNAME in a regular object, and it is overriding
|
|
|
|
|
the symbol defined in the dynamic object.
|
|
|
|
|
|
|
|
|
|
When this happens, we actually want to change NAME, the
|
|
|
|
|
symbol we just added, to refer to SHORTNAME. This will cause
|
|
|
|
|
references to NAME in the shared object to become references
|
|
|
|
|
to SHORTNAME in the regular object. This is what we expect
|
|
|
|
|
when we override a function in a shared object: that the
|
|
|
|
|
references in the shared object will be mapped to the
|
|
|
|
|
definition in the regular object. */
|
|
|
|
|
|
|
|
|
|
while (hi->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| hi->root.type == bfd_link_hash_warning)
|
|
|
|
|
hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
h->root.type = bfd_link_hash_indirect;
|
|
|
|
|
h->root.u.i.link = (struct bfd_link_hash_entry *) hi;
|
|
|
|
|
if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)
|
|
|
|
|
{
|
|
|
|
|
h->elf_link_hash_flags &=~ ELF_LINK_HASH_DEF_DYNAMIC;
|
|
|
|
|
hi->elf_link_hash_flags |= ELF_LINK_HASH_REF_DYNAMIC;
|
|
|
|
|
if (hi->elf_link_hash_flags
|
|
|
|
|
& (ELF_LINK_HASH_REF_REGULAR
|
|
|
|
|
| ELF_LINK_HASH_DEF_REGULAR))
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info, hi))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now set HI to H, so that the following code will set the
|
|
|
|
|
other fields correctly. */
|
|
|
|
|
hi = h;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If there is a duplicate definition somewhere, then HI may not
|
|
|
|
|
point to an indirect symbol. We will have reported an error to
|
|
|
|
|
the user in that case. */
|
|
|
|
|
|
|
|
|
|
if (hi->root.type == bfd_link_hash_indirect)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *ht;
|
|
|
|
|
|
|
|
|
|
ht = (struct elf_link_hash_entry *) hi->root.u.i.link;
|
|
|
|
|
(*bed->elf_backend_copy_indirect_symbol) (bed, ht, hi);
|
|
|
|
|
|
|
|
|
|
/* See if the new flags lead us to realize that the symbol must
|
|
|
|
|
be dynamic. */
|
|
|
|
|
if (! *dynsym)
|
|
|
|
|
{
|
|
|
|
|
if (! dynamic)
|
|
|
|
|
{
|
|
|
|
|
if (info->shared
|
|
|
|
|
|| ((hi->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_REF_DYNAMIC) != 0))
|
|
|
|
|
*dynsym = TRUE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((hi->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_REF_REGULAR) != 0)
|
|
|
|
|
*dynsym = TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We also need to define an indirection from the nondefault version
|
|
|
|
|
of the symbol. */
|
|
|
|
|
|
|
|
|
|
nondefault:
|
|
|
|
|
len = strlen (name);
|
|
|
|
|
shortname = bfd_hash_allocate (&info->hash->table, len);
|
|
|
|
|
if (shortname == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
memcpy (shortname, name, shortlen);
|
|
|
|
|
memcpy (shortname + shortlen, p + 1, len - shortlen);
|
|
|
|
|
|
|
|
|
|
/* Once again, merge with any existing symbol. */
|
|
|
|
|
type_change_ok = FALSE;
|
|
|
|
|
size_change_ok = FALSE;
|
|
|
|
|
sec = *psec;
|
|
|
|
|
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &sec, value,
|
|
|
|
|
&hi, &skip, &override, &type_change_ok,
|
2004-03-19 09:36:45 +08:00
|
|
|
|
&size_change_ok))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (skip)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if (override)
|
|
|
|
|
{
|
|
|
|
|
/* Here SHORTNAME is a versioned name, so we don't expect to see
|
|
|
|
|
the type of override we do in the case above unless it is
|
2003-11-28 02:49:39 +08:00
|
|
|
|
overridden by a versioned definition. */
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (hi->root.type != bfd_link_hash_defined
|
|
|
|
|
&& hi->root.type != bfd_link_hash_defweak)
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: warning: unexpected redefinition of indirect versioned symbol `%s'"),
|
|
|
|
|
bfd_archive_filename (abfd), shortname);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bh = &hi->root;
|
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
|
|
|
|
(info, abfd, shortname, BSF_INDIRECT,
|
2003-08-04 17:39:46 +08:00
|
|
|
|
bfd_ind_section_ptr, 0, name, FALSE, collect, &bh)))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
hi = (struct elf_link_hash_entry *) bh;
|
|
|
|
|
|
|
|
|
|
/* If there is a duplicate definition somewhere, then HI may not
|
|
|
|
|
point to an indirect symbol. We will have reported an error
|
|
|
|
|
to the user in that case. */
|
|
|
|
|
|
|
|
|
|
if (hi->root.type == bfd_link_hash_indirect)
|
|
|
|
|
{
|
|
|
|
|
(*bed->elf_backend_copy_indirect_symbol) (bed, h, hi);
|
|
|
|
|
|
|
|
|
|
/* See if the new flags lead us to realize that the symbol
|
|
|
|
|
must be dynamic. */
|
|
|
|
|
if (! *dynsym)
|
|
|
|
|
{
|
|
|
|
|
if (! dynamic)
|
|
|
|
|
{
|
|
|
|
|
if (info->shared
|
|
|
|
|
|| ((hi->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_REF_DYNAMIC) != 0))
|
|
|
|
|
*dynsym = TRUE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((hi->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_REF_REGULAR) != 0)
|
|
|
|
|
*dynsym = TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This routine is used to export all defined symbols into the dynamic
|
|
|
|
|
symbol table. It is called via elf_link_hash_traverse. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_export_symbol (struct elf_link_hash_entry *h, void *data)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-08-04 17:39:46 +08:00
|
|
|
|
struct elf_info_failed *eif = data;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
/* Ignore indirect symbols. These are added by the versioning code. */
|
|
|
|
|
if (h->root.type == bfd_link_hash_indirect)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
if (h->dynindx == -1
|
|
|
|
|
&& (h->elf_link_hash_flags
|
|
|
|
|
& (ELF_LINK_HASH_DEF_REGULAR | ELF_LINK_HASH_REF_REGULAR)) != 0)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_version_tree *t;
|
|
|
|
|
struct bfd_elf_version_expr *d;
|
|
|
|
|
|
|
|
|
|
for (t = eif->verdefs; t != NULL; t = t->next)
|
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
if (t->globals.list != NULL)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
d = (*t->match) (&t->globals, NULL, h->root.root.string);
|
|
|
|
|
if (d != NULL)
|
|
|
|
|
goto doit;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-22 14:58:17 +08:00
|
|
|
|
if (t->locals.list != NULL)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
d = (*t->match) (&t->locals, NULL, h->root.root.string);
|
|
|
|
|
if (d != NULL)
|
|
|
|
|
return TRUE;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!eif->verdefs)
|
|
|
|
|
{
|
|
|
|
|
doit:
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (eif->info, h))
|
|
|
|
|
{
|
|
|
|
|
eif->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look through the symbols which are defined in other shared
|
|
|
|
|
libraries and referenced here. Update the list of version
|
|
|
|
|
dependencies. This will be put into the .gnu.version_r section.
|
|
|
|
|
This function is called via elf_link_hash_traverse. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_find_version_dependencies (struct elf_link_hash_entry *h,
|
|
|
|
|
void *data)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-08-04 17:39:46 +08:00
|
|
|
|
struct elf_find_verdep_info *rinfo = data;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
Elf_Internal_Verneed *t;
|
|
|
|
|
Elf_Internal_Vernaux *a;
|
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
/* We only care about symbols defined in shared objects with version
|
|
|
|
|
information. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
|
|
|
|
|
|| (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
|
|
|
|
|
|| h->dynindx == -1
|
|
|
|
|
|| h->verinfo.verdef == NULL)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* See if we already know about this version. */
|
|
|
|
|
for (t = elf_tdata (rinfo->output_bfd)->verref; t != NULL; t = t->vn_nextref)
|
|
|
|
|
{
|
|
|
|
|
if (t->vn_bfd != h->verinfo.verdef->vd_bfd)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
|
|
|
|
|
if (a->vna_nodename == h->verinfo.verdef->vd_nodename)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is a new version. Add it to tree we are building. */
|
|
|
|
|
|
|
|
|
|
if (t == NULL)
|
|
|
|
|
{
|
|
|
|
|
amt = sizeof *t;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
t = bfd_zalloc (rinfo->output_bfd, amt);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (t == NULL)
|
|
|
|
|
{
|
|
|
|
|
rinfo->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
t->vn_bfd = h->verinfo.verdef->vd_bfd;
|
|
|
|
|
t->vn_nextref = elf_tdata (rinfo->output_bfd)->verref;
|
|
|
|
|
elf_tdata (rinfo->output_bfd)->verref = t;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
amt = sizeof *a;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
a = bfd_zalloc (rinfo->output_bfd, amt);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
/* Note that we are copying a string pointer here, and testing it
|
|
|
|
|
above. If bfd_elf_string_from_elf_section is ever changed to
|
|
|
|
|
discard the string data when low in memory, this will have to be
|
|
|
|
|
fixed. */
|
|
|
|
|
a->vna_nodename = h->verinfo.verdef->vd_nodename;
|
|
|
|
|
|
|
|
|
|
a->vna_flags = h->verinfo.verdef->vd_flags;
|
|
|
|
|
a->vna_nextptr = t->vn_auxptr;
|
|
|
|
|
|
|
|
|
|
h->verinfo.verdef->vd_exp_refno = rinfo->vers;
|
|
|
|
|
++rinfo->vers;
|
|
|
|
|
|
|
|
|
|
a->vna_other = h->verinfo.verdef->vd_exp_refno + 1;
|
|
|
|
|
|
|
|
|
|
t->vn_auxptr = a;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Figure out appropriate versions for all the symbols. We may not
|
|
|
|
|
have the version number script until we have read all of the input
|
|
|
|
|
files, so until that point we don't know which symbols should be
|
|
|
|
|
local. This function is called via elf_link_hash_traverse. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_assign_sym_version (struct elf_link_hash_entry *h, void *data)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct elf_assign_sym_version_info *sinfo;
|
|
|
|
|
struct bfd_link_info *info;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
struct elf_info_failed eif;
|
|
|
|
|
char *p;
|
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
2003-08-04 17:39:46 +08:00
|
|
|
|
sinfo = data;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
info = sinfo->info;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
/* Fix the symbol flags. */
|
|
|
|
|
eif.failed = FALSE;
|
|
|
|
|
eif.info = info;
|
|
|
|
|
if (! _bfd_elf_fix_symbol_flags (h, &eif))
|
|
|
|
|
{
|
|
|
|
|
if (eif.failed)
|
|
|
|
|
sinfo->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We only need version numbers for symbols defined in regular
|
|
|
|
|
objects. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (sinfo->output_bfd);
|
|
|
|
|
p = strchr (h->root.root.string, ELF_VER_CHR);
|
|
|
|
|
if (p != NULL && h->verinfo.vertree == NULL)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_version_tree *t;
|
|
|
|
|
bfd_boolean hidden;
|
|
|
|
|
|
|
|
|
|
hidden = TRUE;
|
|
|
|
|
|
|
|
|
|
/* There are two consecutive ELF_VER_CHR characters if this is
|
|
|
|
|
not a hidden symbol. */
|
|
|
|
|
++p;
|
|
|
|
|
if (*p == ELF_VER_CHR)
|
|
|
|
|
{
|
|
|
|
|
hidden = FALSE;
|
|
|
|
|
++p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If there is no version string, we can just return out. */
|
|
|
|
|
if (*p == '\0')
|
|
|
|
|
{
|
|
|
|
|
if (hidden)
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HIDDEN;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look for the version. If we find it, it is no longer weak. */
|
|
|
|
|
for (t = sinfo->verdefs; t != NULL; t = t->next)
|
|
|
|
|
{
|
|
|
|
|
if (strcmp (t->name, p) == 0)
|
|
|
|
|
{
|
|
|
|
|
size_t len;
|
|
|
|
|
char *alc;
|
|
|
|
|
struct bfd_elf_version_expr *d;
|
|
|
|
|
|
|
|
|
|
len = p - h->root.root.string;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
alc = bfd_malloc (len);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (alc == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
memcpy (alc, h->root.root.string, len - 1);
|
|
|
|
|
alc[len - 1] = '\0';
|
|
|
|
|
if (alc[len - 2] == ELF_VER_CHR)
|
|
|
|
|
alc[len - 2] = '\0';
|
|
|
|
|
|
|
|
|
|
h->verinfo.vertree = t;
|
|
|
|
|
t->used = TRUE;
|
|
|
|
|
d = NULL;
|
|
|
|
|
|
2003-10-22 14:58:17 +08:00
|
|
|
|
if (t->globals.list != NULL)
|
|
|
|
|
d = (*t->match) (&t->globals, NULL, alc);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
/* See if there is anything to force this symbol to
|
|
|
|
|
local scope. */
|
2003-10-22 14:58:17 +08:00
|
|
|
|
if (d == NULL && t->locals.list != NULL)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
d = (*t->match) (&t->locals, NULL, alc);
|
|
|
|
|
if (d != NULL
|
|
|
|
|
&& h->dynindx != -1
|
|
|
|
|
&& info->shared
|
|
|
|
|
&& ! info->export_dynamic)
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (info, h, TRUE);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (alc);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we are building an application, we need to create a
|
|
|
|
|
version node for this version. */
|
2003-05-30 23:50:12 +08:00
|
|
|
|
if (t == NULL && info->executable)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_version_tree **pp;
|
|
|
|
|
int version_index;
|
|
|
|
|
|
|
|
|
|
/* If we aren't going to export this symbol, we don't need
|
|
|
|
|
to worry about it. */
|
|
|
|
|
if (h->dynindx == -1)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
amt = sizeof *t;
|
2003-10-22 14:58:17 +08:00
|
|
|
|
t = bfd_zalloc (sinfo->output_bfd, amt);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (t == NULL)
|
|
|
|
|
{
|
|
|
|
|
sinfo->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
t->name = p;
|
|
|
|
|
t->name_indx = (unsigned int) -1;
|
|
|
|
|
t->used = TRUE;
|
|
|
|
|
|
|
|
|
|
version_index = 1;
|
|
|
|
|
/* Don't count anonymous version tag. */
|
|
|
|
|
if (sinfo->verdefs != NULL && sinfo->verdefs->vernum == 0)
|
|
|
|
|
version_index = 0;
|
|
|
|
|
for (pp = &sinfo->verdefs; *pp != NULL; pp = &(*pp)->next)
|
|
|
|
|
++version_index;
|
|
|
|
|
t->vernum = version_index;
|
|
|
|
|
|
|
|
|
|
*pp = t;
|
|
|
|
|
|
|
|
|
|
h->verinfo.vertree = t;
|
|
|
|
|
}
|
|
|
|
|
else if (t == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* We could not find the version for a symbol when
|
|
|
|
|
generating a shared archive. Return an error. */
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: undefined versioned symbol name %s"),
|
|
|
|
|
bfd_get_filename (sinfo->output_bfd), h->root.root.string);
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
sinfo->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hidden)
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HIDDEN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we don't have a version for this symbol, see if we can find
|
|
|
|
|
something. */
|
|
|
|
|
if (h->verinfo.vertree == NULL && sinfo->verdefs != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_version_tree *t;
|
|
|
|
|
struct bfd_elf_version_tree *local_ver;
|
|
|
|
|
struct bfd_elf_version_expr *d;
|
|
|
|
|
|
|
|
|
|
/* See if can find what version this symbol is in. If the
|
|
|
|
|
symbol is supposed to be local, then don't actually register
|
|
|
|
|
it. */
|
|
|
|
|
local_ver = NULL;
|
|
|
|
|
for (t = sinfo->verdefs; t != NULL; t = t->next)
|
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
if (t->globals.list != NULL)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_boolean matched;
|
|
|
|
|
|
|
|
|
|
matched = FALSE;
|
2003-10-22 14:58:17 +08:00
|
|
|
|
d = NULL;
|
|
|
|
|
while ((d = (*t->match) (&t->globals, d,
|
|
|
|
|
h->root.root.string)) != NULL)
|
|
|
|
|
if (d->symver)
|
|
|
|
|
matched = TRUE;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* There is a version without definition. Make
|
|
|
|
|
the symbol the default definition for this
|
|
|
|
|
version. */
|
|
|
|
|
h->verinfo.vertree = t;
|
|
|
|
|
local_ver = NULL;
|
|
|
|
|
d->script = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (d != NULL)
|
|
|
|
|
break;
|
|
|
|
|
else if (matched)
|
|
|
|
|
/* There is no undefined version for this symbol. Hide the
|
|
|
|
|
default one. */
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (info, h, TRUE);
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-22 14:58:17 +08:00
|
|
|
|
if (t->locals.list != NULL)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
d = NULL;
|
|
|
|
|
while ((d = (*t->match) (&t->locals, d,
|
|
|
|
|
h->root.root.string)) != NULL)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-10-22 14:58:17 +08:00
|
|
|
|
local_ver = t;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
/* If the match is "*", keep looking for a more
|
2003-10-22 14:58:17 +08:00
|
|
|
|
explicit, perhaps even global, match.
|
|
|
|
|
XXX: Shouldn't this be !d->wildcard instead? */
|
|
|
|
|
if (d->pattern[0] != '*' || d->pattern[1] != '\0')
|
|
|
|
|
break;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (d != NULL)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (local_ver != NULL)
|
|
|
|
|
{
|
|
|
|
|
h->verinfo.vertree = local_ver;
|
|
|
|
|
if (h->dynindx != -1
|
|
|
|
|
&& info->shared
|
|
|
|
|
&& ! info->export_dynamic)
|
|
|
|
|
{
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (info, h, TRUE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read and swap the relocs from the section indicated by SHDR. This
|
|
|
|
|
may be either a REL or a RELA section. The relocations are
|
|
|
|
|
translated into RELA relocations and stored in INTERNAL_RELOCS,
|
|
|
|
|
which should have already been allocated to contain enough space.
|
|
|
|
|
The EXTERNAL_RELOCS are a buffer where the external form of the
|
|
|
|
|
relocations should be stored.
|
|
|
|
|
|
|
|
|
|
Returns FALSE if something goes wrong. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
elf_link_read_relocs_from_section (bfd *abfd,
|
2003-09-25 15:10:42 +08:00
|
|
|
|
asection *sec,
|
2003-08-04 17:39:46 +08:00
|
|
|
|
Elf_Internal_Shdr *shdr,
|
|
|
|
|
void *external_relocs,
|
|
|
|
|
Elf_Internal_Rela *internal_relocs)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
void (*swap_in) (bfd *, const bfd_byte *, Elf_Internal_Rela *);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
const bfd_byte *erela;
|
|
|
|
|
const bfd_byte *erelaend;
|
|
|
|
|
Elf_Internal_Rela *irela;
|
2003-09-25 15:10:42 +08:00
|
|
|
|
Elf_Internal_Shdr *symtab_hdr;
|
|
|
|
|
size_t nsyms;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
/* Position ourselves at the start of the section. */
|
|
|
|
|
if (bfd_seek (abfd, shdr->sh_offset, SEEK_SET) != 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Read the relocations. */
|
|
|
|
|
if (bfd_bread (external_relocs, shdr->sh_size, abfd) != shdr->sh_size)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
2003-09-25 15:10:42 +08:00
|
|
|
|
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
|
nsyms = symtab_hdr->sh_size / symtab_hdr->sh_entsize;
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
|
|
|
|
|
|
/* Convert the external relocations to the internal format. */
|
|
|
|
|
if (shdr->sh_entsize == bed->s->sizeof_rel)
|
|
|
|
|
swap_in = bed->s->swap_reloc_in;
|
|
|
|
|
else if (shdr->sh_entsize == bed->s->sizeof_rela)
|
|
|
|
|
swap_in = bed->s->swap_reloca_in;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
erela = external_relocs;
|
2004-03-16 18:29:12 +08:00
|
|
|
|
erelaend = erela + shdr->sh_size;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
irela = internal_relocs;
|
|
|
|
|
while (erela < erelaend)
|
|
|
|
|
{
|
2003-09-25 15:10:42 +08:00
|
|
|
|
bfd_vma r_symndx;
|
|
|
|
|
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
(*swap_in) (abfd, erela, irela);
|
2003-09-25 15:10:42 +08:00
|
|
|
|
r_symndx = ELF32_R_SYM (irela->r_info);
|
|
|
|
|
if (bed->s->arch_size == 64)
|
|
|
|
|
r_symndx >>= 24;
|
|
|
|
|
if ((size_t) r_symndx >= nsyms)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: bad reloc symbol index (0x%lx >= 0x%lx) for offset 0x%lx in section `%s'"),
|
|
|
|
|
bfd_archive_filename (abfd), (unsigned long) r_symndx,
|
|
|
|
|
(unsigned long) nsyms, irela->r_offset, sec->name);
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
irela += bed->s->int_rels_per_ext_rel;
|
|
|
|
|
erela += shdr->sh_entsize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read and swap the relocs for a section O. They may have been
|
|
|
|
|
cached. If the EXTERNAL_RELOCS and INTERNAL_RELOCS arguments are
|
|
|
|
|
not NULL, they are used as buffers to read into. They are known to
|
|
|
|
|
be large enough. If the INTERNAL_RELOCS relocs argument is NULL,
|
|
|
|
|
the return value is allocated using either malloc or bfd_alloc,
|
|
|
|
|
according to the KEEP_MEMORY argument. If O has two relocation
|
|
|
|
|
sections (both REL and RELA relocations), then the REL_HDR
|
|
|
|
|
relocations will appear first in INTERNAL_RELOCS, followed by the
|
|
|
|
|
REL_HDR2 relocations. */
|
|
|
|
|
|
|
|
|
|
Elf_Internal_Rela *
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_read_relocs (bfd *abfd,
|
|
|
|
|
asection *o,
|
|
|
|
|
void *external_relocs,
|
|
|
|
|
Elf_Internal_Rela *internal_relocs,
|
|
|
|
|
bfd_boolean keep_memory)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr *rel_hdr;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
void *alloc1 = NULL;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
Elf_Internal_Rela *alloc2 = NULL;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
if (elf_section_data (o)->relocs != NULL)
|
|
|
|
|
return elf_section_data (o)->relocs;
|
|
|
|
|
|
|
|
|
|
if (o->reloc_count == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
rel_hdr = &elf_section_data (o)->rel_hdr;
|
|
|
|
|
|
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
|
|
|
|
|
size = o->reloc_count;
|
|
|
|
|
size *= bed->s->int_rels_per_ext_rel * sizeof (Elf_Internal_Rela);
|
|
|
|
|
if (keep_memory)
|
2003-08-04 17:39:46 +08:00
|
|
|
|
internal_relocs = bfd_alloc (abfd, size);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
else
|
2003-08-04 17:39:46 +08:00
|
|
|
|
internal_relocs = alloc2 = bfd_malloc (size);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (external_relocs == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type size = rel_hdr->sh_size;
|
|
|
|
|
|
|
|
|
|
if (elf_section_data (o)->rel_hdr2)
|
|
|
|
|
size += elf_section_data (o)->rel_hdr2->sh_size;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
alloc1 = bfd_malloc (size);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (alloc1 == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
external_relocs = alloc1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-25 15:10:42 +08:00
|
|
|
|
if (!elf_link_read_relocs_from_section (abfd, o, rel_hdr,
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
external_relocs,
|
|
|
|
|
internal_relocs))
|
|
|
|
|
goto error_return;
|
2004-03-16 18:29:12 +08:00
|
|
|
|
if (elf_section_data (o)->rel_hdr2
|
|
|
|
|
&& (!elf_link_read_relocs_from_section
|
|
|
|
|
(abfd, o,
|
|
|
|
|
elf_section_data (o)->rel_hdr2,
|
|
|
|
|
((bfd_byte *) external_relocs) + rel_hdr->sh_size,
|
|
|
|
|
internal_relocs + (NUM_SHDR_ENTRIES (rel_hdr)
|
|
|
|
|
* bed->s->int_rels_per_ext_rel))))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* Cache the results for next time, if we can. */
|
|
|
|
|
if (keep_memory)
|
|
|
|
|
elf_section_data (o)->relocs = internal_relocs;
|
|
|
|
|
|
|
|
|
|
if (alloc1 != NULL)
|
|
|
|
|
free (alloc1);
|
|
|
|
|
|
|
|
|
|
/* Don't free alloc2, since if it was allocated we are passing it
|
|
|
|
|
back (under the name of internal_relocs). */
|
|
|
|
|
|
|
|
|
|
return internal_relocs;
|
|
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
|
if (alloc1 != NULL)
|
|
|
|
|
free (alloc1);
|
|
|
|
|
if (alloc2 != NULL)
|
|
|
|
|
free (alloc2);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute the size of, and allocate space for, REL_HDR which is the
|
|
|
|
|
section header for a section containing relocations for O. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_size_reloc_section (bfd *abfd,
|
|
|
|
|
Elf_Internal_Shdr *rel_hdr,
|
|
|
|
|
asection *o)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_size_type reloc_count;
|
|
|
|
|
bfd_size_type num_rel_hashes;
|
|
|
|
|
|
|
|
|
|
/* Figure out how many relocations there will be. */
|
|
|
|
|
if (rel_hdr == &elf_section_data (o)->rel_hdr)
|
|
|
|
|
reloc_count = elf_section_data (o)->rel_count;
|
|
|
|
|
else
|
|
|
|
|
reloc_count = elf_section_data (o)->rel_count2;
|
|
|
|
|
|
|
|
|
|
num_rel_hashes = o->reloc_count;
|
|
|
|
|
if (num_rel_hashes < reloc_count)
|
|
|
|
|
num_rel_hashes = reloc_count;
|
|
|
|
|
|
|
|
|
|
/* That allows us to calculate the size of the section. */
|
|
|
|
|
rel_hdr->sh_size = rel_hdr->sh_entsize * reloc_count;
|
|
|
|
|
|
|
|
|
|
/* The contents field must last into write_object_contents, so we
|
|
|
|
|
allocate it with bfd_alloc rather than malloc. Also since we
|
|
|
|
|
cannot be sure that the contents will actually be filled in,
|
|
|
|
|
we zero the allocated space. */
|
2003-08-04 17:39:46 +08:00
|
|
|
|
rel_hdr->contents = bfd_zalloc (abfd, rel_hdr->sh_size);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (rel_hdr->contents == NULL && rel_hdr->sh_size != 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* We only allocate one set of hash entries, so we only do it the
|
|
|
|
|
first time we are called. */
|
|
|
|
|
if (elf_section_data (o)->rel_hashes == NULL
|
|
|
|
|
&& num_rel_hashes)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry **p;
|
|
|
|
|
|
2003-08-04 17:39:46 +08:00
|
|
|
|
p = bfd_zmalloc (num_rel_hashes * sizeof (struct elf_link_hash_entry *));
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if (p == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
elf_section_data (o)->rel_hashes = p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy the relocations indicated by the INTERNAL_RELOCS (which
|
|
|
|
|
originated from the section given by INPUT_REL_HDR) to the
|
|
|
|
|
OUTPUT_BFD. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_output_relocs (bfd *output_bfd,
|
|
|
|
|
asection *input_section,
|
|
|
|
|
Elf_Internal_Shdr *input_rel_hdr,
|
|
|
|
|
Elf_Internal_Rela *internal_relocs)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Rela *irela;
|
|
|
|
|
Elf_Internal_Rela *irelaend;
|
|
|
|
|
bfd_byte *erel;
|
|
|
|
|
Elf_Internal_Shdr *output_rel_hdr;
|
|
|
|
|
asection *output_section;
|
|
|
|
|
unsigned int *rel_countp = NULL;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
2003-08-04 17:39:46 +08:00
|
|
|
|
void (*swap_out) (bfd *, const Elf_Internal_Rela *, bfd_byte *);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
output_section = input_section->output_section;
|
|
|
|
|
output_rel_hdr = NULL;
|
|
|
|
|
|
|
|
|
|
if (elf_section_data (output_section)->rel_hdr.sh_entsize
|
|
|
|
|
== input_rel_hdr->sh_entsize)
|
|
|
|
|
{
|
|
|
|
|
output_rel_hdr = &elf_section_data (output_section)->rel_hdr;
|
|
|
|
|
rel_countp = &elf_section_data (output_section)->rel_count;
|
|
|
|
|
}
|
|
|
|
|
else if (elf_section_data (output_section)->rel_hdr2
|
|
|
|
|
&& (elf_section_data (output_section)->rel_hdr2->sh_entsize
|
|
|
|
|
== input_rel_hdr->sh_entsize))
|
|
|
|
|
{
|
|
|
|
|
output_rel_hdr = elf_section_data (output_section)->rel_hdr2;
|
|
|
|
|
rel_countp = &elf_section_data (output_section)->rel_count2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: relocation size mismatch in %s section %s"),
|
|
|
|
|
bfd_get_filename (output_bfd),
|
|
|
|
|
bfd_archive_filename (input_section->owner),
|
|
|
|
|
input_section->name);
|
|
|
|
|
bfd_set_error (bfd_error_wrong_object_format);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (output_bfd);
|
|
|
|
|
if (input_rel_hdr->sh_entsize == bed->s->sizeof_rel)
|
|
|
|
|
swap_out = bed->s->swap_reloc_out;
|
|
|
|
|
else if (input_rel_hdr->sh_entsize == bed->s->sizeof_rela)
|
|
|
|
|
swap_out = bed->s->swap_reloca_out;
|
|
|
|
|
else
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
erel = output_rel_hdr->contents;
|
|
|
|
|
erel += *rel_countp * input_rel_hdr->sh_entsize;
|
|
|
|
|
irela = internal_relocs;
|
|
|
|
|
irelaend = irela + (NUM_SHDR_ENTRIES (input_rel_hdr)
|
|
|
|
|
* bed->s->int_rels_per_ext_rel);
|
|
|
|
|
while (irela < irelaend)
|
|
|
|
|
{
|
|
|
|
|
(*swap_out) (output_bfd, irela, erel);
|
|
|
|
|
irela += bed->s->int_rels_per_ext_rel;
|
|
|
|
|
erel += input_rel_hdr->sh_entsize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Bump the counter, so that we know where to add the next set of
|
|
|
|
|
relocations. */
|
|
|
|
|
*rel_countp += NUM_SHDR_ENTRIES (input_rel_hdr);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fix up the flags for a symbol. This handles various cases which
|
|
|
|
|
can only be fixed after all the input files are seen. This is
|
|
|
|
|
currently called by both adjust_dynamic_symbol and
|
|
|
|
|
assign_sym_version, which is unnecessary but perhaps more robust in
|
|
|
|
|
the face of future changes. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_fix_symbol_flags (struct elf_link_hash_entry *h,
|
|
|
|
|
struct elf_info_failed *eif)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
/* If this symbol was mentioned in a non-ELF file, try to set
|
|
|
|
|
DEF_REGULAR and REF_REGULAR correctly. This is the only way to
|
|
|
|
|
permit a non-ELF file to correctly refer to a symbol defined in
|
|
|
|
|
an ELF dynamic object. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_NON_ELF) != 0)
|
|
|
|
|
{
|
|
|
|
|
while (h->root.type == bfd_link_hash_indirect)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
if (h->root.type != bfd_link_hash_defined
|
|
|
|
|
&& h->root.type != bfd_link_hash_defweak)
|
|
|
|
|
h->elf_link_hash_flags |= (ELF_LINK_HASH_REF_REGULAR
|
|
|
|
|
| ELF_LINK_HASH_REF_REGULAR_NONWEAK);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (h->root.u.def.section->owner != NULL
|
|
|
|
|
&& (bfd_get_flavour (h->root.u.def.section->owner)
|
|
|
|
|
== bfd_target_elf_flavour))
|
|
|
|
|
h->elf_link_hash_flags |= (ELF_LINK_HASH_REF_REGULAR
|
|
|
|
|
| ELF_LINK_HASH_REF_REGULAR_NONWEAK);
|
|
|
|
|
else
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (h->dynindx == -1
|
|
|
|
|
&& ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
|
|
|
|
|
|| (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0))
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (eif->info, h))
|
|
|
|
|
{
|
|
|
|
|
eif->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Unfortunately, ELF_LINK_NON_ELF is only correct if the symbol
|
|
|
|
|
was first seen in a non-ELF file. Fortunately, if the symbol
|
|
|
|
|
was first seen in an ELF file, we're probably OK unless the
|
|
|
|
|
symbol was defined in a non-ELF file. Catch that case here.
|
|
|
|
|
FIXME: We're still in trouble if the symbol was first seen in
|
|
|
|
|
a dynamic object, and then later in a non-ELF regular object. */
|
|
|
|
|
if ((h->root.type == bfd_link_hash_defined
|
|
|
|
|
|| h->root.type == bfd_link_hash_defweak)
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
|
|
|
|
|
&& (h->root.u.def.section->owner != NULL
|
|
|
|
|
? (bfd_get_flavour (h->root.u.def.section->owner)
|
|
|
|
|
!= bfd_target_elf_flavour)
|
|
|
|
|
: (bfd_is_abs_section (h->root.u.def.section)
|
|
|
|
|
&& (h->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_DEF_DYNAMIC) == 0)))
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this is a final link, and the symbol was defined as a common
|
|
|
|
|
symbol in a regular object file, and there was no definition in
|
|
|
|
|
any dynamic object, then the linker will have allocated space for
|
|
|
|
|
the symbol in a common section but the ELF_LINK_HASH_DEF_REGULAR
|
|
|
|
|
flag will not have been set. */
|
|
|
|
|
if (h->root.type == bfd_link_hash_defined
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) != 0
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
|
|
|
|
|
&& (h->root.u.def.section->owner->flags & DYNAMIC) == 0)
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
|
|
|
|
|
/* If -Bsymbolic was used (which means to bind references to global
|
|
|
|
|
symbols to the definition within the shared object), and this
|
|
|
|
|
symbol was defined in a regular object, then it actually doesn't
|
2003-05-17 14:16:03 +08:00
|
|
|
|
need a PLT entry. Likewise, if the symbol has non-default
|
|
|
|
|
visibility. If the symbol has hidden or internal visibility, we
|
2003-05-15 22:54:47 +08:00
|
|
|
|
will force it local. */
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0
|
|
|
|
|
&& eif->info->shared
|
2003-12-01 14:28:24 +08:00
|
|
|
|
&& is_elf_hash_table (eif->info->hash)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& (eif->info->symbolic
|
2003-05-15 22:54:47 +08:00
|
|
|
|
|| ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0)
|
|
|
|
|
{
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
bfd_boolean force_local;
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
|
|
|
|
|
|
|
|
|
|
force_local = (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
|
|
|
|
|
|| ELF_ST_VISIBILITY (h->other) == STV_HIDDEN);
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (eif->info, h, force_local);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If a weak undefined symbol has non-default visibility, we also
|
|
|
|
|
hide it from the dynamic linker. */
|
2003-05-17 14:16:03 +08:00
|
|
|
|
if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak)
|
|
|
|
|
{
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (eif->info, h, TRUE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this is a weak defined symbol in a dynamic object, and we know
|
|
|
|
|
the real definition in the dynamic object, copy interesting flags
|
|
|
|
|
over to the real definition. */
|
|
|
|
|
if (h->weakdef != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *weakdef;
|
|
|
|
|
|
|
|
|
|
weakdef = h->weakdef;
|
|
|
|
|
if (h->root.type == bfd_link_hash_indirect)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT (h->root.type == bfd_link_hash_defined
|
|
|
|
|
|| h->root.type == bfd_link_hash_defweak);
|
|
|
|
|
BFD_ASSERT (weakdef->root.type == bfd_link_hash_defined
|
|
|
|
|
|| weakdef->root.type == bfd_link_hash_defweak);
|
|
|
|
|
BFD_ASSERT (weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC);
|
|
|
|
|
|
|
|
|
|
/* If the real definition is defined by a regular object file,
|
|
|
|
|
don't do anything special. See the longer description in
|
|
|
|
|
_bfd_elf_adjust_dynamic_symbol, below. */
|
|
|
|
|
if ((weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0)
|
|
|
|
|
h->weakdef = NULL;
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (elf_hash_table (eif->info)->dynobj);
|
|
|
|
|
(*bed->elf_backend_copy_indirect_symbol) (bed, weakdef, h);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make the backend pick a good value for a dynamic symbol. This is
|
|
|
|
|
called via elf_link_hash_traverse, and also calls itself
|
|
|
|
|
recursively. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_adjust_dynamic_symbol (struct elf_link_hash_entry *h, void *data)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
2003-08-04 17:39:46 +08:00
|
|
|
|
struct elf_info_failed *eif = data;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
bfd *dynobj;
|
2003-08-07 16:38:11 +08:00
|
|
|
|
const struct elf_backend_data *bed;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
2003-12-01 14:28:24 +08:00
|
|
|
|
if (! is_elf_hash_table (eif->info->hash))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
{
|
|
|
|
|
h->plt = elf_hash_table (eif->info)->init_offset;
|
|
|
|
|
h->got = elf_hash_table (eif->info)->init_offset;
|
|
|
|
|
|
|
|
|
|
/* When warning symbols are created, they **replace** the "real"
|
|
|
|
|
entry in the hash table, thus we never get to see the real
|
|
|
|
|
symbol in a hash traversal. So look at it now. */
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Ignore indirect symbols. These are added by the versioning code. */
|
|
|
|
|
if (h->root.type == bfd_link_hash_indirect)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* Fix the symbol flags. */
|
|
|
|
|
if (! _bfd_elf_fix_symbol_flags (h, eif))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* If this symbol does not require a PLT entry, and it is not
|
|
|
|
|
defined by a dynamic object, or is not referenced by a regular
|
|
|
|
|
object, ignore it. We do have to handle a weak defined symbol,
|
|
|
|
|
even if no regular object refers to it, if we decided to add it
|
|
|
|
|
to the dynamic symbol table. FIXME: Do we normally need to worry
|
|
|
|
|
about symbols which are defined by one dynamic object and
|
|
|
|
|
referenced by another one? */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) == 0
|
|
|
|
|
&& ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
|
|
|
|
|
|| (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
|
|
|
|
|
|| ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0
|
|
|
|
|
&& (h->weakdef == NULL || h->weakdef->dynindx == -1))))
|
|
|
|
|
{
|
|
|
|
|
h->plt = elf_hash_table (eif->info)->init_offset;
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we've already adjusted this symbol, don't do it again. This
|
|
|
|
|
can happen via a recursive call. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DYNAMIC_ADJUSTED) != 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* Don't look at this symbol again. Note that we must set this
|
|
|
|
|
after checking the above conditions, because we may look at a
|
|
|
|
|
symbol once, decide not to do anything, and then get called
|
|
|
|
|
recursively later after REF_REGULAR is set below. */
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DYNAMIC_ADJUSTED;
|
|
|
|
|
|
|
|
|
|
/* If this is a weak definition, and we know a real definition, and
|
|
|
|
|
the real symbol is not itself defined by a regular object file,
|
|
|
|
|
then get a good value for the real definition. We handle the
|
|
|
|
|
real symbol first, for the convenience of the backend routine.
|
|
|
|
|
|
|
|
|
|
Note that there is a confusing case here. If the real definition
|
|
|
|
|
is defined by a regular object file, we don't get the real symbol
|
|
|
|
|
from the dynamic object, but we do get the weak symbol. If the
|
|
|
|
|
processor backend uses a COPY reloc, then if some routine in the
|
|
|
|
|
dynamic object changes the real symbol, we will not see that
|
|
|
|
|
change in the corresponding weak symbol. This is the way other
|
|
|
|
|
ELF linkers work as well, and seems to be a result of the shared
|
|
|
|
|
library model.
|
|
|
|
|
|
|
|
|
|
I will clarify this issue. Most SVR4 shared libraries define the
|
|
|
|
|
variable _timezone and define timezone as a weak synonym. The
|
|
|
|
|
tzset call changes _timezone. If you write
|
|
|
|
|
extern int timezone;
|
|
|
|
|
int _timezone = 5;
|
|
|
|
|
int main () { tzset (); printf ("%d %d\n", timezone, _timezone); }
|
|
|
|
|
you might expect that, since timezone is a synonym for _timezone,
|
|
|
|
|
the same number will print both times. However, if the processor
|
|
|
|
|
backend uses a COPY reloc, then actually timezone will be copied
|
|
|
|
|
into your process image, and, since you define _timezone
|
|
|
|
|
yourself, _timezone will not. Thus timezone and _timezone will
|
|
|
|
|
wind up at different memory locations. The tzset call will set
|
|
|
|
|
_timezone, leaving timezone unchanged. */
|
|
|
|
|
|
|
|
|
|
if (h->weakdef != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* If we get to this point, we know there is an implicit
|
|
|
|
|
reference by a regular object file via the weak symbol H.
|
|
|
|
|
FIXME: Is this really true? What if the traversal finds
|
|
|
|
|
H->WEAKDEF before it finds H? */
|
|
|
|
|
h->weakdef->elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR;
|
|
|
|
|
|
2003-08-04 17:39:46 +08:00
|
|
|
|
if (! _bfd_elf_adjust_dynamic_symbol (h->weakdef, eif))
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If a symbol has no type and no size and does not require a PLT
|
|
|
|
|
entry, then we are probably about to do the wrong thing here: we
|
|
|
|
|
are probably going to create a COPY reloc for an empty object.
|
|
|
|
|
This case can arise when a shared object is built with assembly
|
|
|
|
|
code, and the assembly code fails to set the symbol type. */
|
|
|
|
|
if (h->size == 0
|
|
|
|
|
&& h->type == STT_NOTYPE
|
|
|
|
|
&& (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) == 0)
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("warning: type and size of dynamic symbol `%s' are not defined"),
|
|
|
|
|
h->root.root.string);
|
|
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (eif->info)->dynobj;
|
|
|
|
|
bed = get_elf_backend_data (dynobj);
|
|
|
|
|
if (! (*bed->elf_backend_adjust_dynamic_symbol) (eif->info, h))
|
|
|
|
|
{
|
|
|
|
|
eif->failed = TRUE;
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adjust all external symbols pointing into SEC_MERGE sections
|
|
|
|
|
to reflect the object merging within the sections. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_link_sec_merge_syms (struct elf_link_hash_entry *h, void *data)
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
{
|
|
|
|
|
asection *sec;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
if ((h->root.type == bfd_link_hash_defined
|
|
|
|
|
|| h->root.type == bfd_link_hash_defweak)
|
|
|
|
|
&& ((sec = h->root.u.def.section)->flags & SEC_MERGE)
|
|
|
|
|
&& sec->sec_info_type == ELF_INFO_TYPE_MERGE)
|
|
|
|
|
{
|
2003-08-04 17:39:46 +08:00
|
|
|
|
bfd *output_bfd = data;
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
|
|
|
|
|
h->root.u.def.value =
|
|
|
|
|
_bfd_merged_section_offset (output_bfd,
|
|
|
|
|
&h->root.u.def.section,
|
|
|
|
|
elf_section_data (sec)->sec_info,
|
2003-08-04 17:39:46 +08:00
|
|
|
|
h->root.u.def.value, 0);
|
* elflink.c (_bfd_elf_link_create_dynamic_sections): Move from
elflink.h. Replace LOG_FILE_ALIGN with bed->s->log_file_align.
(_bfd_elf_create_dynamic_sections): Use bed->s->log_file_align.
(bfd_elf_record_link_assignment): Move from elflink.h.
(_bfd_elf_merge_symbol): Likewise.
(_bfd_elf_add_default_symbol): Likewise.
(_bfd_elf_export_symbol): Likewise.
(_bfd_elf_link_find_version_dependencies): Likewise.
(_bfd_elf_link_assign_sym_version): Likewise.
(_bfd_elf_link_read_relocs): Likewise.
(_bfd_elf_link_size_reloc_section): Likewise.
(_bfd_elf_fix_symbol_flags): Likewise.
(_bfd_elf_adjust_dynamic_symbol): Likewise.
(_bfd_elf_link_sec_merge_syms): Likewise.
(elf_link_read_relocs_from_section): Likewise. Use bed->s->sizeof_rel
and bed->s->sizeof_rela.
(_bfd_elf_link_output_relocs): Likewise.
* elf-bfd.h (struct elf_size_info): Rename file_align to
log_file_align.
(struct elf_info_failed): Move from elflink.h.
(struct elf_assign_sym_version_info): Likewise.
(struct elf_find_verdep_info): Likewise.
(_bfd_elf_create_dynamic_sections): Delete duplicate declaration.
(_bfd_elf_merge_symbol, _bfd_elf_add_default_symbol,
_bfd_elf_export_symbol, _bfd_elf_link_find_version_dependencies,
_bfd_elf_link_assign_sym_version,
_bfd_elf_link_create_dynamic_sections, _bfd_elf_link_read_relocs,
_bfd_elf_link_size_reloc_section, _bfd_elf_link_output_relocs,
_bfd_elf_fix_symbol_flags, _bfd_elf_adjust_dynamic_symbol,
_bfd_elf_link_sec_merge_syms): Declare.
(bfd_elf32_link_create_dynamic_sections): Don't declare.
(_bfd_elf32_link_read_relocs): Likewise.
(bfd_elf64_link_create_dynamic_sections): Likewise.
(_bfd_elf64_link_read_relocs): Likewise.
* elflink.h: Move lots o' stuff elsewhere.
* bfd-in.h (bfd_elf32_record_link_assignment): Don't declare.
(bfd_elf64_record_link_assignment): Likewise.
(bfd_elf_record_link_assignment): Declare.
* bfd-in2.h: Regenerate.
* elfcode.h (elf_link_create_dynamic_sections): Don't declare.
(NAME(_bfd_elf,size_info)): Adjust for log_file_align.
* elf.c (_bfd_elf_init_reloc_shdr): Adjust for bed->s->log_file_align.
(assign_file_positions_for_segments): Likewise.
(assign_file_positions_except_relocs): Likewise.
(swap_out_syms, elfcore_write_note): Likewise.
* elf-m10200.c: Adjust for changed function names.
* elf-m10300.c: Likewise.
* elf32-arm.h: Likewise.
* elf32-h8300.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mips.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sh64.c: Likewise.
* elfxx-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
(MIPS_ELF_LOG_FILE_ALIGN): Use log_file_align.
* elf64-alpha.c (alpha_elf_size_info): Adjust for log_file_align.
* elf64-hppa.c (hppa64_elf_size_info): Likewise.
* elf64-mips.c (mips_elf64_size_info): Likewise.
* elf64-s390.c (s390_elf64_size_info): Likewise.
* elf64-sparc.c (sparc64_elf_size_info): Likewise.
2003-05-09 10:27:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
2003-07-19 05:09:28 +08:00
|
|
|
|
|
|
|
|
|
/* Returns false if the symbol referred to by H should be considered
|
|
|
|
|
to resolve local to the current module, and true if it should be
|
|
|
|
|
considered to bind dynamically. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_dynamic_symbol_p (struct elf_link_hash_entry *h,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
bfd_boolean ignore_protected)
|
2003-07-19 05:09:28 +08:00
|
|
|
|
{
|
|
|
|
|
bfd_boolean binding_stays_local_p;
|
|
|
|
|
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
while (h->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
/* If it was forced local, then clearly it's not dynamic. */
|
|
|
|
|
if (h->dynindx == -1)
|
|
|
|
|
return FALSE;
|
|
|
|
|
if (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Identify the cases where name binding rules say that a
|
|
|
|
|
visible symbol resolves locally. */
|
|
|
|
|
binding_stays_local_p = info->executable || info->symbolic;
|
|
|
|
|
|
|
|
|
|
switch (ELF_ST_VISIBILITY (h->other))
|
|
|
|
|
{
|
|
|
|
|
case STV_INTERNAL:
|
|
|
|
|
case STV_HIDDEN:
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
case STV_PROTECTED:
|
|
|
|
|
/* Proper resolution for function pointer equality may require
|
|
|
|
|
that these symbols perhaps be resolved dynamically, even though
|
|
|
|
|
we should be resolving them to the current module. */
|
|
|
|
|
if (!ignore_protected)
|
|
|
|
|
binding_stays_local_p = TRUE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-19 14:41:42 +08:00
|
|
|
|
/* If it isn't defined locally, then clearly it's dynamic. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
2003-07-19 05:09:28 +08:00
|
|
|
|
/* Otherwise, the symbol is dynamic if binding rules don't tell
|
|
|
|
|
us that it remains local. */
|
|
|
|
|
return !binding_stays_local_p;
|
|
|
|
|
}
|
2003-07-21 08:24:10 +08:00
|
|
|
|
|
|
|
|
|
/* Return true if the symbol referred to by H should be considered
|
|
|
|
|
to resolve local to the current module, and false otherwise. Differs
|
|
|
|
|
from (the inverse of) _bfd_elf_dynamic_symbol_p in the treatment of
|
|
|
|
|
undefined symbols and weak symbols. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
2003-08-04 17:39:46 +08:00
|
|
|
|
_bfd_elf_symbol_refs_local_p (struct elf_link_hash_entry *h,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
bfd_boolean local_protected)
|
2003-07-21 08:24:10 +08:00
|
|
|
|
{
|
|
|
|
|
/* If it's a local sym, of course we resolve locally. */
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* If we don't have a definition in a regular file, then we can't
|
|
|
|
|
resolve locally. The sym is either undefined or dynamic. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Forced local symbols resolve locally. */
|
|
|
|
|
if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* As do non-dynamic symbols. */
|
|
|
|
|
if (h->dynindx == -1)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* At this point, we know the symbol is defined and dynamic. In an
|
|
|
|
|
executable it must resolve locally, likewise when building symbolic
|
|
|
|
|
shared libraries. */
|
|
|
|
|
if (info->executable || info->symbolic)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* Now deal with defined dynamic symbols in shared libraries. Ones
|
|
|
|
|
with default visibility might not resolve locally. */
|
|
|
|
|
if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* However, STV_HIDDEN or STV_INTERNAL ones must be local. */
|
|
|
|
|
if (ELF_ST_VISIBILITY (h->other) != STV_PROTECTED)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
/* Function pointer equality tests may require that STV_PROTECTED
|
|
|
|
|
symbols be treated as dynamic symbols, even when we know that the
|
|
|
|
|
dynamic linker will resolve them locally. */
|
|
|
|
|
return local_protected;
|
|
|
|
|
}
|
2003-11-04 14:16:39 +08:00
|
|
|
|
|
|
|
|
|
/* Caches some TLS segment info, and ensures that the TLS segment vma is
|
|
|
|
|
aligned. Returns the first TLS output section. */
|
|
|
|
|
|
|
|
|
|
struct bfd_section *
|
|
|
|
|
_bfd_elf_tls_setup (bfd *obfd, struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_section *sec, *tls;
|
|
|
|
|
unsigned int align = 0;
|
|
|
|
|
|
|
|
|
|
for (sec = obfd->sections; sec != NULL; sec = sec->next)
|
|
|
|
|
if ((sec->flags & SEC_THREAD_LOCAL) != 0)
|
|
|
|
|
break;
|
|
|
|
|
tls = sec;
|
|
|
|
|
|
|
|
|
|
for (; sec != NULL && (sec->flags & SEC_THREAD_LOCAL) != 0; sec = sec->next)
|
|
|
|
|
if (sec->alignment_power > align)
|
|
|
|
|
align = sec->alignment_power;
|
|
|
|
|
|
|
|
|
|
elf_hash_table (info)->tls_sec = tls;
|
|
|
|
|
|
|
|
|
|
/* Ensure the alignment of the first section is the largest alignment,
|
|
|
|
|
so that the tls segment starts aligned. */
|
|
|
|
|
if (tls != NULL)
|
|
|
|
|
tls->alignment_power = align;
|
|
|
|
|
|
|
|
|
|
return tls;
|
|
|
|
|
}
|
2004-02-29 14:11:52 +08:00
|
|
|
|
|
|
|
|
|
/* Return TRUE iff this is a non-common, definition of a non-function symbol. */
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
is_global_data_symbol_definition (bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
|
Elf_Internal_Sym *sym)
|
|
|
|
|
{
|
|
|
|
|
/* Local symbols do not count, but target specific ones might. */
|
|
|
|
|
if (ELF_ST_BIND (sym->st_info) != STB_GLOBAL
|
|
|
|
|
&& ELF_ST_BIND (sym->st_info) < STB_LOOS)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Function symbols do not count. */
|
|
|
|
|
if (ELF_ST_TYPE (sym->st_info) == STT_FUNC)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* If the section is undefined, then so is the symbol. */
|
|
|
|
|
if (sym->st_shndx == SHN_UNDEF)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* If the symbol is defined in the common section, then
|
|
|
|
|
it is a common definition and so does not count. */
|
|
|
|
|
if (sym->st_shndx == SHN_COMMON)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* If the symbol is in a target specific section then we
|
|
|
|
|
must rely upon the backend to tell us what it is. */
|
|
|
|
|
if (sym->st_shndx >= SHN_LORESERVE && sym->st_shndx < SHN_ABS)
|
|
|
|
|
/* FIXME - this function is not coded yet:
|
|
|
|
|
|
|
|
|
|
return _bfd_is_global_symbol_definition (abfd, sym);
|
|
|
|
|
|
|
|
|
|
Instead for now assume that the definition is not global,
|
|
|
|
|
Even if this is wrong, at least the linker will behave
|
|
|
|
|
in the same way that it used to do. */
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Search the symbol table of the archive element of the archive ABFD
|
|
|
|
|
whose archive map contains a mention of SYMDEF, and determine if
|
|
|
|
|
the symbol is defined in this element. */
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr * hdr;
|
|
|
|
|
bfd_size_type symcount;
|
|
|
|
|
bfd_size_type extsymcount;
|
|
|
|
|
bfd_size_type extsymoff;
|
|
|
|
|
Elf_Internal_Sym *isymbuf;
|
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
|
Elf_Internal_Sym *isymend;
|
|
|
|
|
bfd_boolean result;
|
|
|
|
|
|
|
|
|
|
abfd = _bfd_get_elt_at_filepos (abfd, symdef->file_offset);
|
|
|
|
|
if (abfd == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (! bfd_check_format (abfd, bfd_object))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* If we have already included the element containing this symbol in the
|
|
|
|
|
link then we do not need to include it again. Just claim that any symbol
|
|
|
|
|
it contains is not a definition, so that our caller will not decide to
|
|
|
|
|
(re)include this element. */
|
|
|
|
|
if (abfd->archive_pass)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Select the appropriate symbol table. */
|
|
|
|
|
if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0)
|
|
|
|
|
hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
|
else
|
|
|
|
|
hdr = &elf_tdata (abfd)->dynsymtab_hdr;
|
|
|
|
|
|
|
|
|
|
symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
|
|
|
|
|
|
|
|
|
|
/* The sh_info field of the symtab header tells us where the
|
|
|
|
|
external symbols start. We don't care about the local symbols. */
|
|
|
|
|
if (elf_bad_symtab (abfd))
|
|
|
|
|
{
|
|
|
|
|
extsymcount = symcount;
|
|
|
|
|
extsymoff = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
extsymcount = symcount - hdr->sh_info;
|
|
|
|
|
extsymoff = hdr->sh_info;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (extsymcount == 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Read in the symbol table. */
|
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Scan the symbol table looking for SYMDEF. */
|
|
|
|
|
result = FALSE;
|
|
|
|
|
for (isym = isymbuf, isymend = isymbuf + extsymcount; isym < isymend; isym++)
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
name = bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
|
|
|
|
|
isym->st_name);
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (strcmp (name, symdef->name) == 0)
|
|
|
|
|
{
|
|
|
|
|
result = is_global_data_symbol_definition (abfd, isym);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (isymbuf);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-25 20:48:45 +08:00
|
|
|
|
/* Add an entry to the .dynamic table. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
|
_bfd_elf_add_dynamic_entry (struct bfd_link_info *info,
|
|
|
|
|
bfd_vma tag,
|
|
|
|
|
bfd_vma val)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_table *hash_table;
|
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
|
asection *s;
|
|
|
|
|
bfd_size_type newsize;
|
|
|
|
|
bfd_byte *newcontents;
|
|
|
|
|
Elf_Internal_Dyn dyn;
|
|
|
|
|
|
|
|
|
|
hash_table = elf_hash_table (info);
|
|
|
|
|
if (! is_elf_hash_table (hash_table))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (hash_table->dynobj);
|
|
|
|
|
s = bfd_get_section_by_name (hash_table->dynobj, ".dynamic");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
|
|
|
|
|
newsize = s->_raw_size + bed->s->sizeof_dyn;
|
|
|
|
|
newcontents = bfd_realloc (s->contents, newsize);
|
|
|
|
|
if (newcontents == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
dyn.d_tag = tag;
|
|
|
|
|
dyn.d_un.d_val = val;
|
|
|
|
|
bed->s->swap_dyn_out (hash_table->dynobj, &dyn, newcontents + s->_raw_size);
|
|
|
|
|
|
|
|
|
|
s->_raw_size = newsize;
|
|
|
|
|
s->contents = newcontents;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a DT_NEEDED entry for this dynamic object if DO_IT is true,
|
|
|
|
|
otherwise just check whether one already exists. Returns -1 on error,
|
|
|
|
|
1 if a DT_NEEDED tag already exists, and 0 on success. */
|
|
|
|
|
|
2004-03-26 13:55:15 +08:00
|
|
|
|
static int
|
|
|
|
|
elf_add_dt_needed_tag (struct bfd_link_info *info,
|
|
|
|
|
const char *soname,
|
|
|
|
|
bfd_boolean do_it)
|
2004-03-25 20:48:45 +08:00
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_table *hash_table;
|
|
|
|
|
bfd_size_type oldsize;
|
|
|
|
|
bfd_size_type strindex;
|
|
|
|
|
|
|
|
|
|
hash_table = elf_hash_table (info);
|
|
|
|
|
oldsize = _bfd_elf_strtab_size (hash_table->dynstr);
|
|
|
|
|
strindex = _bfd_elf_strtab_add (hash_table->dynstr, soname, FALSE);
|
|
|
|
|
if (strindex == (bfd_size_type) -1)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (oldsize == _bfd_elf_strtab_size (hash_table->dynstr))
|
|
|
|
|
{
|
|
|
|
|
asection *sdyn;
|
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
|
bfd_byte *extdyn;
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (hash_table->dynobj);
|
|
|
|
|
sdyn = bfd_get_section_by_name (hash_table->dynobj, ".dynamic");
|
|
|
|
|
BFD_ASSERT (sdyn != NULL);
|
|
|
|
|
|
|
|
|
|
for (extdyn = sdyn->contents;
|
|
|
|
|
extdyn < sdyn->contents + sdyn->_raw_size;
|
|
|
|
|
extdyn += bed->s->sizeof_dyn)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Dyn dyn;
|
|
|
|
|
|
|
|
|
|
bed->s->swap_dyn_in (hash_table->dynobj, extdyn, &dyn);
|
|
|
|
|
if (dyn.d_tag == DT_NEEDED
|
|
|
|
|
&& dyn.d_un.d_val == strindex)
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_strtab_delref (hash_table->dynstr, strindex);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (do_it)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_NEEDED, strindex))
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* We were just checking for existence of the tag. */
|
|
|
|
|
_bfd_elf_strtab_delref (hash_table->dynstr, strindex);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sort symbol by value and section. */
|
2004-03-26 13:55:15 +08:00
|
|
|
|
static int
|
|
|
|
|
elf_sort_symbol (const void *arg1, const void *arg2)
|
2004-03-25 20:48:45 +08:00
|
|
|
|
{
|
|
|
|
|
const struct elf_link_hash_entry *h1;
|
|
|
|
|
const struct elf_link_hash_entry *h2;
|
|
|
|
|
bfd_signed_vma vdiff;
|
|
|
|
|
|
|
|
|
|
h1 = *(const struct elf_link_hash_entry **) arg1;
|
|
|
|
|
h2 = *(const struct elf_link_hash_entry **) arg2;
|
|
|
|
|
vdiff = h1->root.u.def.value - h2->root.u.def.value;
|
|
|
|
|
if (vdiff != 0)
|
|
|
|
|
return vdiff > 0 ? 1 : -1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
long sdiff = h1->root.u.def.section - h2->root.u.def.section;
|
|
|
|
|
if (sdiff != 0)
|
|
|
|
|
return sdiff > 0 ? 1 : -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2004-03-26 13:55:15 +08:00
|
|
|
|
|
2004-03-25 20:48:45 +08:00
|
|
|
|
/* This function is used to adjust offsets into .dynstr for
|
|
|
|
|
dynamic symbols. This is called via elf_link_hash_traverse. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
elf_adjust_dynstr_offsets (struct elf_link_hash_entry *h, void *data)
|
|
|
|
|
{
|
|
|
|
|
struct elf_strtab_hash *dynstr = data;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
if (h->dynindx != -1)
|
|
|
|
|
h->dynstr_index = _bfd_elf_strtab_offset (dynstr, h->dynstr_index);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assign string offsets in .dynstr, update all structures referencing
|
|
|
|
|
them. */
|
|
|
|
|
|
2004-03-26 13:55:15 +08:00
|
|
|
|
static bfd_boolean
|
|
|
|
|
elf_finalize_dynstr (bfd *output_bfd, struct bfd_link_info *info)
|
2004-03-25 20:48:45 +08:00
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_table *hash_table = elf_hash_table (info);
|
|
|
|
|
struct elf_link_local_dynamic_entry *entry;
|
|
|
|
|
struct elf_strtab_hash *dynstr = hash_table->dynstr;
|
|
|
|
|
bfd *dynobj = hash_table->dynobj;
|
|
|
|
|
asection *sdyn;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
|
bfd_byte *extdyn;
|
|
|
|
|
|
|
|
|
|
_bfd_elf_strtab_finalize (dynstr);
|
|
|
|
|
size = _bfd_elf_strtab_size (dynstr);
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (dynobj);
|
|
|
|
|
sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
|
|
|
|
|
BFD_ASSERT (sdyn != NULL);
|
|
|
|
|
|
|
|
|
|
/* Update all .dynamic entries referencing .dynstr strings. */
|
|
|
|
|
for (extdyn = sdyn->contents;
|
|
|
|
|
extdyn < sdyn->contents + sdyn->_raw_size;
|
|
|
|
|
extdyn += bed->s->sizeof_dyn)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Dyn dyn;
|
|
|
|
|
|
|
|
|
|
bed->s->swap_dyn_in (dynobj, extdyn, &dyn);
|
|
|
|
|
switch (dyn.d_tag)
|
|
|
|
|
{
|
|
|
|
|
case DT_STRSZ:
|
|
|
|
|
dyn.d_un.d_val = size;
|
|
|
|
|
break;
|
|
|
|
|
case DT_NEEDED:
|
|
|
|
|
case DT_SONAME:
|
|
|
|
|
case DT_RPATH:
|
|
|
|
|
case DT_RUNPATH:
|
|
|
|
|
case DT_FILTER:
|
|
|
|
|
case DT_AUXILIARY:
|
|
|
|
|
dyn.d_un.d_val = _bfd_elf_strtab_offset (dynstr, dyn.d_un.d_val);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
bed->s->swap_dyn_out (dynobj, &dyn, extdyn);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now update local dynamic symbols. */
|
|
|
|
|
for (entry = hash_table->dynlocal; entry ; entry = entry->next)
|
|
|
|
|
entry->isym.st_name = _bfd_elf_strtab_offset (dynstr,
|
|
|
|
|
entry->isym.st_name);
|
|
|
|
|
|
|
|
|
|
/* And the rest of dynamic symbols. */
|
|
|
|
|
elf_link_hash_traverse (hash_table, elf_adjust_dynstr_offsets, dynstr);
|
|
|
|
|
|
|
|
|
|
/* Adjust version definitions. */
|
|
|
|
|
if (elf_tdata (output_bfd)->cverdefs)
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
bfd_byte *p;
|
|
|
|
|
bfd_size_type i;
|
|
|
|
|
Elf_Internal_Verdef def;
|
|
|
|
|
Elf_Internal_Verdaux defaux;
|
|
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".gnu.version_d");
|
|
|
|
|
p = s->contents;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_swap_verdef_in (output_bfd, (Elf_External_Verdef *) p,
|
|
|
|
|
&def);
|
|
|
|
|
p += sizeof (Elf_External_Verdef);
|
|
|
|
|
for (i = 0; i < def.vd_cnt; ++i)
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_swap_verdaux_in (output_bfd,
|
|
|
|
|
(Elf_External_Verdaux *) p, &defaux);
|
|
|
|
|
defaux.vda_name = _bfd_elf_strtab_offset (dynstr,
|
|
|
|
|
defaux.vda_name);
|
|
|
|
|
_bfd_elf_swap_verdaux_out (output_bfd,
|
|
|
|
|
&defaux, (Elf_External_Verdaux *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verdaux);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (def.vd_next);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Adjust version references. */
|
|
|
|
|
if (elf_tdata (output_bfd)->verref)
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
bfd_byte *p;
|
|
|
|
|
bfd_size_type i;
|
|
|
|
|
Elf_Internal_Verneed need;
|
|
|
|
|
Elf_Internal_Vernaux needaux;
|
|
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".gnu.version_r");
|
|
|
|
|
p = s->contents;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_swap_verneed_in (output_bfd, (Elf_External_Verneed *) p,
|
|
|
|
|
&need);
|
|
|
|
|
need.vn_file = _bfd_elf_strtab_offset (dynstr, need.vn_file);
|
|
|
|
|
_bfd_elf_swap_verneed_out (output_bfd, &need,
|
|
|
|
|
(Elf_External_Verneed *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verneed);
|
|
|
|
|
for (i = 0; i < need.vn_cnt; ++i)
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_swap_vernaux_in (output_bfd,
|
|
|
|
|
(Elf_External_Vernaux *) p, &needaux);
|
|
|
|
|
needaux.vna_name = _bfd_elf_strtab_offset (dynstr,
|
|
|
|
|
needaux.vna_name);
|
|
|
|
|
_bfd_elf_swap_vernaux_out (output_bfd,
|
|
|
|
|
&needaux,
|
|
|
|
|
(Elf_External_Vernaux *) p);
|
|
|
|
|
p += sizeof (Elf_External_Vernaux);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (need.vn_next);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-26 13:55:15 +08:00
|
|
|
|
/* Add symbols from an ELF object file to the linker hash table. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
bfd_boolean (*add_symbol_hook)
|
|
|
|
|
(bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
|
|
|
|
|
const char **, flagword *, asection **, bfd_vma *);
|
|
|
|
|
bfd_boolean (*check_relocs)
|
|
|
|
|
(bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *);
|
|
|
|
|
bfd_boolean collect;
|
|
|
|
|
Elf_Internal_Shdr *hdr;
|
|
|
|
|
bfd_size_type symcount;
|
|
|
|
|
bfd_size_type extsymcount;
|
|
|
|
|
bfd_size_type extsymoff;
|
|
|
|
|
struct elf_link_hash_entry **sym_hash;
|
|
|
|
|
bfd_boolean dynamic;
|
|
|
|
|
Elf_External_Versym *extversym = NULL;
|
|
|
|
|
Elf_External_Versym *ever;
|
|
|
|
|
struct elf_link_hash_entry *weaks;
|
|
|
|
|
struct elf_link_hash_entry **nondeflt_vers = NULL;
|
|
|
|
|
bfd_size_type nondeflt_vers_cnt = 0;
|
|
|
|
|
Elf_Internal_Sym *isymbuf = NULL;
|
|
|
|
|
Elf_Internal_Sym *isym;
|
|
|
|
|
Elf_Internal_Sym *isymend;
|
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
|
bfd_boolean add_needed;
|
|
|
|
|
struct elf_link_hash_table * hash_table;
|
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
|
|
hash_table = elf_hash_table (info);
|
|
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
|
add_symbol_hook = bed->elf_add_symbol_hook;
|
|
|
|
|
collect = bed->collect;
|
|
|
|
|
|
|
|
|
|
if ((abfd->flags & DYNAMIC) == 0)
|
|
|
|
|
dynamic = FALSE;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
dynamic = TRUE;
|
|
|
|
|
|
|
|
|
|
/* You can't use -r against a dynamic object. Also, there's no
|
|
|
|
|
hope of using a dynamic object which does not exactly match
|
|
|
|
|
the format of the output file. */
|
|
|
|
|
if (info->relocatable
|
|
|
|
|
|| !is_elf_hash_table (hash_table)
|
|
|
|
|
|| hash_table->root.creator != abfd->xvec)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_invalid_operation);
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* As a GNU extension, any input sections which are named
|
|
|
|
|
.gnu.warning.SYMBOL are treated as warning symbols for the given
|
|
|
|
|
symbol. This differs from .gnu.warning sections, which generate
|
|
|
|
|
warnings when they are included in an output file. */
|
|
|
|
|
if (info->executable)
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
|
|
|
|
|
for (s = abfd->sections; s != NULL; s = s->next)
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
name = bfd_get_section_name (abfd, s);
|
|
|
|
|
if (strncmp (name, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0)
|
|
|
|
|
{
|
|
|
|
|
char *msg;
|
|
|
|
|
bfd_size_type sz;
|
|
|
|
|
bfd_size_type prefix_len;
|
|
|
|
|
const char * gnu_warning_prefix = _("warning: ");
|
|
|
|
|
|
|
|
|
|
name += sizeof ".gnu.warning." - 1;
|
|
|
|
|
|
|
|
|
|
/* If this is a shared object, then look up the symbol
|
|
|
|
|
in the hash table. If it is there, and it is already
|
|
|
|
|
been defined, then we will not be using the entry
|
|
|
|
|
from this shared object, so we don't need to warn.
|
|
|
|
|
FIXME: If we see the definition in a regular object
|
|
|
|
|
later on, we will warn, but we shouldn't. The only
|
|
|
|
|
fix is to keep track of what warnings we are supposed
|
|
|
|
|
to emit, and then handle them all at the end of the
|
|
|
|
|
link. */
|
|
|
|
|
if (dynamic)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
|
|
|
|
|
h = elf_link_hash_lookup (hash_table, name,
|
|
|
|
|
FALSE, FALSE, TRUE);
|
|
|
|
|
|
|
|
|
|
/* FIXME: What about bfd_link_hash_common? */
|
|
|
|
|
if (h != NULL
|
|
|
|
|
&& (h->root.type == bfd_link_hash_defined
|
|
|
|
|
|| h->root.type == bfd_link_hash_defweak))
|
|
|
|
|
{
|
|
|
|
|
/* We don't want to issue this warning. Clobber
|
|
|
|
|
the section size so that the warning does not
|
|
|
|
|
get copied into the output file. */
|
|
|
|
|
s->_raw_size = 0;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sz = bfd_section_size (abfd, s);
|
|
|
|
|
prefix_len = strlen (gnu_warning_prefix);
|
|
|
|
|
msg = bfd_alloc (abfd, prefix_len + sz + 1);
|
|
|
|
|
if (msg == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
strcpy (msg, gnu_warning_prefix);
|
|
|
|
|
if (! bfd_get_section_contents (abfd, s, msg + prefix_len, 0, sz))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
msg[prefix_len + sz] = '\0';
|
|
|
|
|
|
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
|
|
|
|
(info, abfd, name, BSF_WARNING, s, 0, msg,
|
|
|
|
|
FALSE, collect, NULL)))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
if (! info->relocatable)
|
|
|
|
|
{
|
|
|
|
|
/* Clobber the section size so that the warning does
|
|
|
|
|
not get copied into the output file. */
|
|
|
|
|
s->_raw_size = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
add_needed = TRUE;
|
|
|
|
|
if (! dynamic)
|
|
|
|
|
{
|
|
|
|
|
/* If we are creating a shared library, create all the dynamic
|
|
|
|
|
sections immediately. We need to attach them to something,
|
|
|
|
|
so we attach them to this BFD, provided it is the right
|
|
|
|
|
format. FIXME: If there are no input BFD's of the same
|
|
|
|
|
format as the output, we can't make a shared library. */
|
|
|
|
|
if (info->shared
|
|
|
|
|
&& is_elf_hash_table (hash_table)
|
|
|
|
|
&& hash_table->root.creator == abfd->xvec
|
|
|
|
|
&& ! hash_table->dynamic_sections_created)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_create_dynamic_sections (abfd, info))
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!is_elf_hash_table (hash_table))
|
|
|
|
|
goto error_return;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
const char *soname = NULL;
|
|
|
|
|
struct bfd_link_needed_list *rpath = NULL, *runpath = NULL;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
/* ld --just-symbols and dynamic objects don't mix very well.
|
|
|
|
|
Test for --just-symbols by looking at info set up by
|
|
|
|
|
_bfd_elf_link_just_syms. */
|
|
|
|
|
if ((s = abfd->sections) != NULL
|
|
|
|
|
&& s->sec_info_type == ELF_INFO_TYPE_JUST_SYMS)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* If this dynamic lib was specified on the command line with
|
|
|
|
|
--as-needed in effect, then we don't want to add a DT_NEEDED
|
|
|
|
|
tag unless the lib is actually used. Similary for libs brought
|
|
|
|
|
in by another lib's DT_NEEDED. */
|
|
|
|
|
add_needed = elf_dyn_lib_class (abfd) == DYN_NORMAL;
|
|
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (abfd, ".dynamic");
|
|
|
|
|
if (s != NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_byte *dynbuf;
|
|
|
|
|
bfd_byte *extdyn;
|
|
|
|
|
int elfsec;
|
|
|
|
|
unsigned long shlink;
|
|
|
|
|
|
|
|
|
|
dynbuf = bfd_malloc (s->_raw_size);
|
|
|
|
|
if (dynbuf == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
if (! bfd_get_section_contents (abfd, s, dynbuf, 0, s->_raw_size))
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
|
|
|
|
|
elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
|
|
|
|
|
if (elfsec == -1)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
shlink = elf_elfsections (abfd)[elfsec]->sh_link;
|
|
|
|
|
|
|
|
|
|
for (extdyn = dynbuf;
|
|
|
|
|
extdyn < dynbuf + s->_raw_size;
|
|
|
|
|
extdyn += bed->s->sizeof_dyn)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Dyn dyn;
|
|
|
|
|
|
|
|
|
|
bed->s->swap_dyn_in (abfd, extdyn, &dyn);
|
|
|
|
|
if (dyn.d_tag == DT_SONAME)
|
|
|
|
|
{
|
|
|
|
|
unsigned int tagv = dyn.d_un.d_val;
|
|
|
|
|
soname = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
|
|
|
|
|
if (soname == NULL)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
}
|
|
|
|
|
if (dyn.d_tag == DT_NEEDED)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_link_needed_list *n, **pn;
|
|
|
|
|
char *fnm, *anm;
|
|
|
|
|
unsigned int tagv = dyn.d_un.d_val;
|
|
|
|
|
|
|
|
|
|
amt = sizeof (struct bfd_link_needed_list);
|
|
|
|
|
n = bfd_alloc (abfd, amt);
|
|
|
|
|
fnm = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
|
|
|
|
|
if (n == NULL || fnm == NULL)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
amt = strlen (fnm) + 1;
|
|
|
|
|
anm = bfd_alloc (abfd, amt);
|
|
|
|
|
if (anm == NULL)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
memcpy (anm, fnm, amt);
|
|
|
|
|
n->name = anm;
|
|
|
|
|
n->by = abfd;
|
|
|
|
|
n->next = NULL;
|
|
|
|
|
for (pn = & hash_table->needed;
|
|
|
|
|
*pn != NULL;
|
|
|
|
|
pn = &(*pn)->next)
|
|
|
|
|
;
|
|
|
|
|
*pn = n;
|
|
|
|
|
}
|
|
|
|
|
if (dyn.d_tag == DT_RUNPATH)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_link_needed_list *n, **pn;
|
|
|
|
|
char *fnm, *anm;
|
|
|
|
|
unsigned int tagv = dyn.d_un.d_val;
|
|
|
|
|
|
|
|
|
|
amt = sizeof (struct bfd_link_needed_list);
|
|
|
|
|
n = bfd_alloc (abfd, amt);
|
|
|
|
|
fnm = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
|
|
|
|
|
if (n == NULL || fnm == NULL)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
amt = strlen (fnm) + 1;
|
|
|
|
|
anm = bfd_alloc (abfd, amt);
|
|
|
|
|
if (anm == NULL)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
memcpy (anm, fnm, amt);
|
|
|
|
|
n->name = anm;
|
|
|
|
|
n->by = abfd;
|
|
|
|
|
n->next = NULL;
|
|
|
|
|
for (pn = & runpath;
|
|
|
|
|
*pn != NULL;
|
|
|
|
|
pn = &(*pn)->next)
|
|
|
|
|
;
|
|
|
|
|
*pn = n;
|
|
|
|
|
}
|
|
|
|
|
/* Ignore DT_RPATH if we have seen DT_RUNPATH. */
|
|
|
|
|
if (!runpath && dyn.d_tag == DT_RPATH)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_link_needed_list *n, **pn;
|
|
|
|
|
char *fnm, *anm;
|
|
|
|
|
unsigned int tagv = dyn.d_un.d_val;
|
|
|
|
|
|
|
|
|
|
amt = sizeof (struct bfd_link_needed_list);
|
|
|
|
|
n = bfd_alloc (abfd, amt);
|
|
|
|
|
fnm = bfd_elf_string_from_elf_section (abfd, shlink, tagv);
|
|
|
|
|
if (n == NULL || fnm == NULL)
|
|
|
|
|
goto error_free_dyn;
|
|
|
|
|
amt = strlen (fnm) + 1;
|
|
|
|
|
anm = bfd_alloc (abfd, amt);
|
|
|
|
|
if (anm == NULL)
|
|
|
|
|
{
|
|
|
|
|
error_free_dyn:
|
|
|
|
|
free (dynbuf);
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
memcpy (anm, fnm, amt);
|
|
|
|
|
n->name = anm;
|
|
|
|
|
n->by = abfd;
|
|
|
|
|
n->next = NULL;
|
|
|
|
|
for (pn = & rpath;
|
|
|
|
|
*pn != NULL;
|
|
|
|
|
pn = &(*pn)->next)
|
|
|
|
|
;
|
|
|
|
|
*pn = n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (dynbuf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* DT_RUNPATH overrides DT_RPATH. Do _NOT_ bfd_release, as that
|
|
|
|
|
frees all more recently bfd_alloc'd blocks as well. */
|
|
|
|
|
if (runpath)
|
|
|
|
|
rpath = runpath;
|
|
|
|
|
|
|
|
|
|
if (rpath)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_link_needed_list **pn;
|
|
|
|
|
for (pn = & hash_table->runpath;
|
|
|
|
|
*pn != NULL;
|
|
|
|
|
pn = &(*pn)->next)
|
|
|
|
|
;
|
|
|
|
|
*pn = rpath;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We do not want to include any of the sections in a dynamic
|
|
|
|
|
object in the output file. We hack by simply clobbering the
|
|
|
|
|
list of sections in the BFD. This could be handled more
|
|
|
|
|
cleanly by, say, a new section flag; the existing
|
|
|
|
|
SEC_NEVER_LOAD flag is not the one we want, because that one
|
|
|
|
|
still implies that the section takes up space in the output
|
|
|
|
|
file. */
|
|
|
|
|
bfd_section_list_clear (abfd);
|
|
|
|
|
|
|
|
|
|
/* If this is the first dynamic object found in the link, create
|
|
|
|
|
the special sections required for dynamic linking. */
|
|
|
|
|
if (! _bfd_elf_link_create_dynamic_sections (abfd, info))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* Find the name to use in a DT_NEEDED entry that refers to this
|
|
|
|
|
object. If the object has a DT_SONAME entry, we use it.
|
|
|
|
|
Otherwise, if the generic linker stuck something in
|
|
|
|
|
elf_dt_name, we use that. Otherwise, we just use the file
|
|
|
|
|
name. */
|
|
|
|
|
if (soname == NULL || *soname == '\0')
|
|
|
|
|
{
|
|
|
|
|
soname = elf_dt_name (abfd);
|
|
|
|
|
if (soname == NULL || *soname == '\0')
|
|
|
|
|
soname = bfd_get_filename (abfd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Save the SONAME because sometimes the linker emulation code
|
|
|
|
|
will need to know it. */
|
|
|
|
|
elf_dt_name (abfd) = soname;
|
|
|
|
|
|
|
|
|
|
ret = elf_add_dt_needed_tag (info, soname, add_needed);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* If we have already included this dynamic object in the
|
|
|
|
|
link, just ignore it. There is no reason to include a
|
|
|
|
|
particular dynamic object more than once. */
|
|
|
|
|
if (ret > 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this is a dynamic object, we always link against the .dynsym
|
|
|
|
|
symbol table, not the .symtab symbol table. The dynamic linker
|
|
|
|
|
will only see the .dynsym symbol table, so there is no reason to
|
|
|
|
|
look at .symtab for a dynamic object. */
|
|
|
|
|
|
|
|
|
|
if (! dynamic || elf_dynsymtab (abfd) == 0)
|
|
|
|
|
hdr = &elf_tdata (abfd)->symtab_hdr;
|
|
|
|
|
else
|
|
|
|
|
hdr = &elf_tdata (abfd)->dynsymtab_hdr;
|
|
|
|
|
|
|
|
|
|
symcount = hdr->sh_size / bed->s->sizeof_sym;
|
|
|
|
|
|
|
|
|
|
/* The sh_info field of the symtab header tells us where the
|
|
|
|
|
external symbols start. We don't care about the local symbols at
|
|
|
|
|
this point. */
|
|
|
|
|
if (elf_bad_symtab (abfd))
|
|
|
|
|
{
|
|
|
|
|
extsymcount = symcount;
|
|
|
|
|
extsymoff = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
extsymcount = symcount - hdr->sh_info;
|
|
|
|
|
extsymoff = hdr->sh_info;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sym_hash = NULL;
|
|
|
|
|
if (extsymcount != 0)
|
|
|
|
|
{
|
|
|
|
|
isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
|
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
|
if (isymbuf == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* We store a pointer to the hash table entry for each external
|
|
|
|
|
symbol. */
|
|
|
|
|
amt = extsymcount * sizeof (struct elf_link_hash_entry *);
|
|
|
|
|
sym_hash = bfd_alloc (abfd, amt);
|
|
|
|
|
if (sym_hash == NULL)
|
|
|
|
|
goto error_free_sym;
|
|
|
|
|
elf_sym_hashes (abfd) = sym_hash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dynamic)
|
|
|
|
|
{
|
|
|
|
|
/* Read in any version definitions. */
|
|
|
|
|
if (! _bfd_elf_slurp_version_tables (abfd))
|
|
|
|
|
goto error_free_sym;
|
|
|
|
|
|
|
|
|
|
/* Read in the symbol versions, but don't bother to convert them
|
|
|
|
|
to internal format. */
|
|
|
|
|
if (elf_dynversym (abfd) != 0)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Shdr *versymhdr;
|
|
|
|
|
|
|
|
|
|
versymhdr = &elf_tdata (abfd)->dynversym_hdr;
|
|
|
|
|
extversym = bfd_malloc (versymhdr->sh_size);
|
|
|
|
|
if (extversym == NULL)
|
|
|
|
|
goto error_free_sym;
|
|
|
|
|
amt = versymhdr->sh_size;
|
|
|
|
|
if (bfd_seek (abfd, versymhdr->sh_offset, SEEK_SET) != 0
|
|
|
|
|
|| bfd_bread (extversym, amt, abfd) != amt)
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
weaks = NULL;
|
|
|
|
|
|
|
|
|
|
ever = extversym != NULL ? extversym + extsymoff : NULL;
|
|
|
|
|
for (isym = isymbuf, isymend = isymbuf + extsymcount;
|
|
|
|
|
isym < isymend;
|
|
|
|
|
isym++, sym_hash++, ever = (ever != NULL ? ever + 1 : NULL))
|
|
|
|
|
{
|
|
|
|
|
int bind;
|
|
|
|
|
bfd_vma value;
|
|
|
|
|
asection *sec;
|
|
|
|
|
flagword flags;
|
|
|
|
|
const char *name;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
bfd_boolean definition;
|
|
|
|
|
bfd_boolean size_change_ok;
|
|
|
|
|
bfd_boolean type_change_ok;
|
|
|
|
|
bfd_boolean new_weakdef;
|
|
|
|
|
bfd_boolean override;
|
|
|
|
|
unsigned int old_alignment;
|
|
|
|
|
bfd *old_bfd;
|
|
|
|
|
|
|
|
|
|
override = FALSE;
|
|
|
|
|
|
|
|
|
|
flags = BSF_NO_FLAGS;
|
|
|
|
|
sec = NULL;
|
|
|
|
|
value = isym->st_value;
|
|
|
|
|
*sym_hash = NULL;
|
|
|
|
|
|
|
|
|
|
bind = ELF_ST_BIND (isym->st_info);
|
|
|
|
|
if (bind == STB_LOCAL)
|
|
|
|
|
{
|
|
|
|
|
/* This should be impossible, since ELF requires that all
|
|
|
|
|
global symbols follow all local symbols, and that sh_info
|
|
|
|
|
point to the first global symbol. Unfortunately, Irix 5
|
|
|
|
|
screws this up. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (bind == STB_GLOBAL)
|
|
|
|
|
{
|
|
|
|
|
if (isym->st_shndx != SHN_UNDEF
|
|
|
|
|
&& isym->st_shndx != SHN_COMMON)
|
|
|
|
|
flags = BSF_GLOBAL;
|
|
|
|
|
}
|
|
|
|
|
else if (bind == STB_WEAK)
|
|
|
|
|
flags = BSF_WEAK;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Leave it up to the processor backend. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isym->st_shndx == SHN_UNDEF)
|
|
|
|
|
sec = bfd_und_section_ptr;
|
|
|
|
|
else if (isym->st_shndx < SHN_LORESERVE || isym->st_shndx > SHN_HIRESERVE)
|
|
|
|
|
{
|
|
|
|
|
sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
|
|
|
|
|
if (sec == NULL)
|
|
|
|
|
sec = bfd_abs_section_ptr;
|
|
|
|
|
else if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
|
|
|
|
|
value -= sec->vma;
|
|
|
|
|
}
|
|
|
|
|
else if (isym->st_shndx == SHN_ABS)
|
|
|
|
|
sec = bfd_abs_section_ptr;
|
|
|
|
|
else if (isym->st_shndx == SHN_COMMON)
|
|
|
|
|
{
|
|
|
|
|
sec = bfd_com_section_ptr;
|
|
|
|
|
/* What ELF calls the size we call the value. What ELF
|
|
|
|
|
calls the value we call the alignment. */
|
|
|
|
|
value = isym->st_size;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Leave it up to the processor backend. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
name = bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
|
|
|
|
|
isym->st_name);
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
|
|
|
|
|
if (isym->st_shndx == SHN_COMMON
|
|
|
|
|
&& ELF_ST_TYPE (isym->st_info) == STT_TLS)
|
|
|
|
|
{
|
|
|
|
|
asection *tcomm = bfd_get_section_by_name (abfd, ".tcommon");
|
|
|
|
|
|
|
|
|
|
if (tcomm == NULL)
|
|
|
|
|
{
|
|
|
|
|
tcomm = bfd_make_section (abfd, ".tcommon");
|
|
|
|
|
if (tcomm == NULL
|
|
|
|
|
|| !bfd_set_section_flags (abfd, tcomm, (SEC_ALLOC
|
|
|
|
|
| SEC_IS_COMMON
|
|
|
|
|
| SEC_LINKER_CREATED
|
|
|
|
|
| SEC_THREAD_LOCAL)))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
}
|
|
|
|
|
sec = tcomm;
|
|
|
|
|
}
|
|
|
|
|
else if (add_symbol_hook)
|
|
|
|
|
{
|
|
|
|
|
if (! (*add_symbol_hook) (abfd, info, isym, &name, &flags, &sec,
|
|
|
|
|
&value))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
|
|
|
|
|
/* The hook function sets the name to NULL if this symbol
|
|
|
|
|
should be skipped for some reason. */
|
|
|
|
|
if (name == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sanity check that all possibilities were handled. */
|
|
|
|
|
if (sec == NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bfd_is_und_section (sec)
|
|
|
|
|
|| bfd_is_com_section (sec))
|
|
|
|
|
definition = FALSE;
|
|
|
|
|
else
|
|
|
|
|
definition = TRUE;
|
|
|
|
|
|
|
|
|
|
size_change_ok = FALSE;
|
|
|
|
|
type_change_ok = get_elf_backend_data (abfd)->type_change_ok;
|
|
|
|
|
old_alignment = 0;
|
|
|
|
|
old_bfd = NULL;
|
|
|
|
|
|
|
|
|
|
if (is_elf_hash_table (hash_table))
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Versym iver;
|
|
|
|
|
unsigned int vernum = 0;
|
|
|
|
|
bfd_boolean skip;
|
|
|
|
|
|
|
|
|
|
if (ever != NULL)
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_swap_versym_in (abfd, ever, &iver);
|
|
|
|
|
vernum = iver.vs_vers & VERSYM_VERSION;
|
|
|
|
|
|
|
|
|
|
/* If this is a hidden symbol, or if it is not version
|
|
|
|
|
1, we append the version name to the symbol name.
|
|
|
|
|
However, we do not modify a non-hidden absolute
|
|
|
|
|
symbol, because it might be the version symbol
|
|
|
|
|
itself. FIXME: What if it isn't? */
|
|
|
|
|
if ((iver.vs_vers & VERSYM_HIDDEN) != 0
|
|
|
|
|
|| (vernum > 1 && ! bfd_is_abs_section (sec)))
|
|
|
|
|
{
|
|
|
|
|
const char *verstr;
|
|
|
|
|
size_t namelen, verlen, newlen;
|
|
|
|
|
char *newname, *p;
|
|
|
|
|
|
|
|
|
|
if (isym->st_shndx != SHN_UNDEF)
|
|
|
|
|
{
|
|
|
|
|
if (vernum > elf_tdata (abfd)->dynverdef_hdr.sh_info)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: %s: invalid version %u (max %d)"),
|
|
|
|
|
bfd_archive_filename (abfd), name, vernum,
|
|
|
|
|
elf_tdata (abfd)->dynverdef_hdr.sh_info);
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
}
|
|
|
|
|
else if (vernum > 1)
|
|
|
|
|
verstr =
|
|
|
|
|
elf_tdata (abfd)->verdef[vernum - 1].vd_nodename;
|
|
|
|
|
else
|
|
|
|
|
verstr = "";
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We cannot simply test for the number of
|
|
|
|
|
entries in the VERNEED section since the
|
|
|
|
|
numbers for the needed versions do not start
|
|
|
|
|
at 0. */
|
|
|
|
|
Elf_Internal_Verneed *t;
|
|
|
|
|
|
|
|
|
|
verstr = NULL;
|
|
|
|
|
for (t = elf_tdata (abfd)->verref;
|
|
|
|
|
t != NULL;
|
|
|
|
|
t = t->vn_nextref)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Vernaux *a;
|
|
|
|
|
|
|
|
|
|
for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
|
|
|
|
|
{
|
|
|
|
|
if (a->vna_other == vernum)
|
|
|
|
|
{
|
|
|
|
|
verstr = a->vna_nodename;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (a != NULL)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (verstr == NULL)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: %s: invalid needed version %d"),
|
|
|
|
|
bfd_archive_filename (abfd), name, vernum);
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
namelen = strlen (name);
|
|
|
|
|
verlen = strlen (verstr);
|
|
|
|
|
newlen = namelen + verlen + 2;
|
|
|
|
|
if ((iver.vs_vers & VERSYM_HIDDEN) == 0
|
|
|
|
|
&& isym->st_shndx != SHN_UNDEF)
|
|
|
|
|
++newlen;
|
|
|
|
|
|
|
|
|
|
newname = bfd_alloc (abfd, newlen);
|
|
|
|
|
if (newname == NULL)
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
memcpy (newname, name, namelen);
|
|
|
|
|
p = newname + namelen;
|
|
|
|
|
*p++ = ELF_VER_CHR;
|
|
|
|
|
/* If this is a defined non-hidden version symbol,
|
|
|
|
|
we add another @ to the name. This indicates the
|
|
|
|
|
default version of the symbol. */
|
|
|
|
|
if ((iver.vs_vers & VERSYM_HIDDEN) == 0
|
|
|
|
|
&& isym->st_shndx != SHN_UNDEF)
|
|
|
|
|
*p++ = ELF_VER_CHR;
|
|
|
|
|
memcpy (p, verstr, verlen + 1);
|
|
|
|
|
|
|
|
|
|
name = newname;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_bfd_elf_merge_symbol (abfd, info, name, isym, &sec, &value,
|
|
|
|
|
sym_hash, &skip, &override,
|
|
|
|
|
&type_change_ok, &size_change_ok))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
|
|
|
|
|
if (skip)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (override)
|
|
|
|
|
definition = FALSE;
|
|
|
|
|
|
|
|
|
|
h = *sym_hash;
|
|
|
|
|
while (h->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
/* Remember the old alignment if this is a common symbol, so
|
|
|
|
|
that we don't reduce the alignment later on. We can't
|
|
|
|
|
check later, because _bfd_generic_link_add_one_symbol
|
|
|
|
|
will set a default for the alignment which we want to
|
|
|
|
|
override. We also remember the old bfd where the existing
|
|
|
|
|
definition comes from. */
|
|
|
|
|
switch (h->root.type)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_link_hash_defined:
|
|
|
|
|
case bfd_link_hash_defweak:
|
|
|
|
|
old_bfd = h->root.u.def.section->owner;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case bfd_link_hash_common:
|
|
|
|
|
old_bfd = h->root.u.c.p->section->owner;
|
|
|
|
|
old_alignment = h->root.u.c.p->alignment_power;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (elf_tdata (abfd)->verdef != NULL
|
|
|
|
|
&& ! override
|
|
|
|
|
&& vernum > 1
|
|
|
|
|
&& definition)
|
|
|
|
|
h->verinfo.verdef = &elf_tdata (abfd)->verdef[vernum - 1];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
|
|
|
|
(info, abfd, name, flags, sec, value, NULL, FALSE, collect,
|
|
|
|
|
(struct bfd_link_hash_entry **) sym_hash)))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
|
|
|
|
|
h = *sym_hash;
|
|
|
|
|
while (h->root.type == bfd_link_hash_indirect
|
|
|
|
|
|| h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
*sym_hash = h;
|
|
|
|
|
|
|
|
|
|
new_weakdef = FALSE;
|
|
|
|
|
if (dynamic
|
|
|
|
|
&& definition
|
|
|
|
|
&& (flags & BSF_WEAK) != 0
|
|
|
|
|
&& ELF_ST_TYPE (isym->st_info) != STT_FUNC
|
|
|
|
|
&& is_elf_hash_table (hash_table)
|
|
|
|
|
&& h->weakdef == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Keep a list of all weak defined non function symbols from
|
|
|
|
|
a dynamic object, using the weakdef field. Later in this
|
|
|
|
|
function we will set the weakdef field to the correct
|
|
|
|
|
value. We only put non-function symbols from dynamic
|
|
|
|
|
objects on this list, because that happens to be the only
|
|
|
|
|
time we need to know the normal symbol corresponding to a
|
|
|
|
|
weak symbol, and the information is time consuming to
|
|
|
|
|
figure out. If the weakdef field is not already NULL,
|
|
|
|
|
then this symbol was already defined by some previous
|
|
|
|
|
dynamic object, and we will be using that previous
|
|
|
|
|
definition anyhow. */
|
|
|
|
|
|
|
|
|
|
h->weakdef = weaks;
|
|
|
|
|
weaks = h;
|
|
|
|
|
new_weakdef = TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the alignment of a common symbol. */
|
|
|
|
|
if (isym->st_shndx == SHN_COMMON
|
|
|
|
|
&& h->root.type == bfd_link_hash_common)
|
|
|
|
|
{
|
|
|
|
|
unsigned int align;
|
|
|
|
|
|
|
|
|
|
align = bfd_log2 (isym->st_value);
|
|
|
|
|
if (align > old_alignment
|
|
|
|
|
/* Permit an alignment power of zero if an alignment of one
|
|
|
|
|
is specified and no other alignments have been specified. */
|
|
|
|
|
|| (isym->st_value == 1 && old_alignment == 0))
|
|
|
|
|
h->root.u.c.p->alignment_power = align;
|
|
|
|
|
else
|
|
|
|
|
h->root.u.c.p->alignment_power = old_alignment;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_elf_hash_table (hash_table))
|
|
|
|
|
{
|
|
|
|
|
int old_flags;
|
|
|
|
|
bfd_boolean dynsym;
|
|
|
|
|
int new_flag;
|
|
|
|
|
|
|
|
|
|
/* Check the alignment when a common symbol is involved. This
|
|
|
|
|
can change when a common symbol is overridden by a normal
|
|
|
|
|
definition or a common symbol is ignored due to the old
|
|
|
|
|
normal definition. We need to make sure the maximum
|
|
|
|
|
alignment is maintained. */
|
|
|
|
|
if ((old_alignment || isym->st_shndx == SHN_COMMON)
|
|
|
|
|
&& h->root.type != bfd_link_hash_common)
|
|
|
|
|
{
|
|
|
|
|
unsigned int common_align;
|
|
|
|
|
unsigned int normal_align;
|
|
|
|
|
unsigned int symbol_align;
|
|
|
|
|
bfd *normal_bfd;
|
|
|
|
|
bfd *common_bfd;
|
|
|
|
|
|
|
|
|
|
symbol_align = ffs (h->root.u.def.value) - 1;
|
|
|
|
|
if (h->root.u.def.section->owner != NULL
|
|
|
|
|
&& (h->root.u.def.section->owner->flags & DYNAMIC) == 0)
|
|
|
|
|
{
|
|
|
|
|
normal_align = h->root.u.def.section->alignment_power;
|
|
|
|
|
if (normal_align > symbol_align)
|
|
|
|
|
normal_align = symbol_align;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
normal_align = symbol_align;
|
|
|
|
|
|
|
|
|
|
if (old_alignment)
|
|
|
|
|
{
|
|
|
|
|
common_align = old_alignment;
|
|
|
|
|
common_bfd = old_bfd;
|
|
|
|
|
normal_bfd = abfd;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
common_align = bfd_log2 (isym->st_value);
|
|
|
|
|
common_bfd = abfd;
|
|
|
|
|
normal_bfd = old_bfd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (normal_align < common_align)
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("Warning: alignment %u of symbol `%s' in %s is smaller than %u in %s"),
|
|
|
|
|
1 << normal_align,
|
|
|
|
|
name,
|
|
|
|
|
bfd_archive_filename (normal_bfd),
|
|
|
|
|
1 << common_align,
|
|
|
|
|
bfd_archive_filename (common_bfd));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remember the symbol size and type. */
|
|
|
|
|
if (isym->st_size != 0
|
|
|
|
|
&& (definition || h->size == 0))
|
|
|
|
|
{
|
|
|
|
|
if (h->size != 0 && h->size != isym->st_size && ! size_change_ok)
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("Warning: size of symbol `%s' changed from %lu in %s to %lu in %s"),
|
|
|
|
|
name, (unsigned long) h->size,
|
|
|
|
|
bfd_archive_filename (old_bfd),
|
|
|
|
|
(unsigned long) isym->st_size,
|
|
|
|
|
bfd_archive_filename (abfd));
|
|
|
|
|
|
|
|
|
|
h->size = isym->st_size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this is a common symbol, then we always want H->SIZE
|
|
|
|
|
to be the size of the common symbol. The code just above
|
|
|
|
|
won't fix the size if a common symbol becomes larger. We
|
|
|
|
|
don't warn about a size change here, because that is
|
|
|
|
|
covered by --warn-common. */
|
|
|
|
|
if (h->root.type == bfd_link_hash_common)
|
|
|
|
|
h->size = h->root.u.c.size;
|
|
|
|
|
|
|
|
|
|
if (ELF_ST_TYPE (isym->st_info) != STT_NOTYPE
|
|
|
|
|
&& (definition || h->type == STT_NOTYPE))
|
|
|
|
|
{
|
|
|
|
|
if (h->type != STT_NOTYPE
|
|
|
|
|
&& h->type != ELF_ST_TYPE (isym->st_info)
|
|
|
|
|
&& ! type_change_ok)
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("Warning: type of symbol `%s' changed from %d to %d in %s"),
|
|
|
|
|
name, h->type, ELF_ST_TYPE (isym->st_info),
|
|
|
|
|
bfd_archive_filename (abfd));
|
|
|
|
|
|
|
|
|
|
h->type = ELF_ST_TYPE (isym->st_info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If st_other has a processor-specific meaning, specific
|
|
|
|
|
code might be needed here. We never merge the visibility
|
|
|
|
|
attribute with the one from a dynamic object. */
|
|
|
|
|
if (bed->elf_backend_merge_symbol_attribute)
|
|
|
|
|
(*bed->elf_backend_merge_symbol_attribute) (h, isym, definition,
|
|
|
|
|
dynamic);
|
|
|
|
|
|
|
|
|
|
if (isym->st_other != 0 && !dynamic)
|
|
|
|
|
{
|
|
|
|
|
unsigned char hvis, symvis, other, nvis;
|
|
|
|
|
|
|
|
|
|
/* Take the balance of OTHER from the definition. */
|
|
|
|
|
other = (definition ? isym->st_other : h->other);
|
|
|
|
|
other &= ~ ELF_ST_VISIBILITY (-1);
|
|
|
|
|
|
|
|
|
|
/* Combine visibilities, using the most constraining one. */
|
|
|
|
|
hvis = ELF_ST_VISIBILITY (h->other);
|
|
|
|
|
symvis = ELF_ST_VISIBILITY (isym->st_other);
|
|
|
|
|
if (! hvis)
|
|
|
|
|
nvis = symvis;
|
|
|
|
|
else if (! symvis)
|
|
|
|
|
nvis = hvis;
|
|
|
|
|
else
|
|
|
|
|
nvis = hvis < symvis ? hvis : symvis;
|
|
|
|
|
|
|
|
|
|
h->other = other | nvis;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set a flag in the hash table entry indicating the type of
|
|
|
|
|
reference or definition we just found. Keep a count of
|
|
|
|
|
the number of dynamic symbols we find. A dynamic symbol
|
|
|
|
|
is one which is referenced or defined by both a regular
|
|
|
|
|
object and a shared object. */
|
|
|
|
|
old_flags = h->elf_link_hash_flags;
|
|
|
|
|
dynsym = FALSE;
|
|
|
|
|
if (! dynamic)
|
|
|
|
|
{
|
|
|
|
|
if (! definition)
|
|
|
|
|
{
|
|
|
|
|
new_flag = ELF_LINK_HASH_REF_REGULAR;
|
|
|
|
|
if (bind != STB_WEAK)
|
|
|
|
|
new_flag |= ELF_LINK_HASH_REF_REGULAR_NONWEAK;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
new_flag = ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
if (! info->executable
|
|
|
|
|
|| (old_flags & (ELF_LINK_HASH_DEF_DYNAMIC
|
|
|
|
|
| ELF_LINK_HASH_REF_DYNAMIC)) != 0)
|
|
|
|
|
dynsym = TRUE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (! definition)
|
|
|
|
|
new_flag = ELF_LINK_HASH_REF_DYNAMIC;
|
|
|
|
|
else
|
|
|
|
|
new_flag = ELF_LINK_HASH_DEF_DYNAMIC;
|
|
|
|
|
if ((old_flags & (ELF_LINK_HASH_DEF_REGULAR
|
|
|
|
|
| ELF_LINK_HASH_REF_REGULAR)) != 0
|
|
|
|
|
|| (h->weakdef != NULL
|
|
|
|
|
&& ! new_weakdef
|
|
|
|
|
&& h->weakdef->dynindx != -1))
|
|
|
|
|
dynsym = TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
h->elf_link_hash_flags |= new_flag;
|
|
|
|
|
|
|
|
|
|
/* Check to see if we need to add an indirect symbol for
|
|
|
|
|
the default name. */
|
|
|
|
|
if (definition || h->root.type == bfd_link_hash_common)
|
|
|
|
|
if (!_bfd_elf_add_default_symbol (abfd, info, h, name, isym,
|
|
|
|
|
&sec, &value, &dynsym,
|
|
|
|
|
override))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
|
|
|
|
|
if (definition && !dynamic)
|
|
|
|
|
{
|
|
|
|
|
char *p = strchr (name, ELF_VER_CHR);
|
|
|
|
|
if (p != NULL && p[1] != ELF_VER_CHR)
|
|
|
|
|
{
|
|
|
|
|
/* Queue non-default versions so that .symver x, x@FOO
|
|
|
|
|
aliases can be checked. */
|
|
|
|
|
if (! nondeflt_vers)
|
|
|
|
|
{
|
|
|
|
|
amt = (isymend - isym + 1)
|
|
|
|
|
* sizeof (struct elf_link_hash_entry *);
|
|
|
|
|
nondeflt_vers = bfd_malloc (amt);
|
|
|
|
|
}
|
|
|
|
|
nondeflt_vers [nondeflt_vers_cnt++] = h;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (dynsym && h->dynindx == -1)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
if (h->weakdef != NULL
|
|
|
|
|
&& ! new_weakdef
|
|
|
|
|
&& h->weakdef->dynindx == -1)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info, h->weakdef))
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (dynsym && h->dynindx != -1)
|
|
|
|
|
/* If the symbol already has a dynamic index, but
|
|
|
|
|
visibility says it should not be visible, turn it into
|
|
|
|
|
a local symbol. */
|
|
|
|
|
switch (ELF_ST_VISIBILITY (h->other))
|
|
|
|
|
{
|
|
|
|
|
case STV_INTERNAL:
|
|
|
|
|
case STV_HIDDEN:
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (info, h, TRUE);
|
|
|
|
|
dynsym = FALSE;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!add_needed
|
|
|
|
|
&& definition
|
|
|
|
|
&& dynsym
|
|
|
|
|
&& (h->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_REF_REGULAR) != 0)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
const char *soname = elf_dt_name (abfd);
|
|
|
|
|
|
|
|
|
|
/* A symbol from a library loaded via DT_NEEDED of some
|
|
|
|
|
other library is referenced by a regular object.
|
|
|
|
|
Add a DT_NEEDED entry for it. */
|
|
|
|
|
add_needed = TRUE;
|
|
|
|
|
ret = elf_add_dt_needed_tag (info, soname, add_needed);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto error_free_vers;
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT (ret == 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now that all the symbols from this input file are created, handle
|
|
|
|
|
.symver foo, foo@BAR such that any relocs against foo become foo@BAR. */
|
|
|
|
|
if (nondeflt_vers != NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type cnt, symidx;
|
|
|
|
|
|
|
|
|
|
for (cnt = 0; cnt < nondeflt_vers_cnt; ++cnt)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *h = nondeflt_vers[cnt], *hi;
|
|
|
|
|
char *shortname, *p;
|
|
|
|
|
|
|
|
|
|
p = strchr (h->root.root.string, ELF_VER_CHR);
|
|
|
|
|
if (p == NULL
|
|
|
|
|
|| (h->root.type != bfd_link_hash_defined
|
|
|
|
|
&& h->root.type != bfd_link_hash_defweak))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
amt = p - h->root.root.string;
|
|
|
|
|
shortname = bfd_malloc (amt + 1);
|
|
|
|
|
memcpy (shortname, h->root.root.string, amt);
|
|
|
|
|
shortname[amt] = '\0';
|
|
|
|
|
|
|
|
|
|
hi = (struct elf_link_hash_entry *)
|
|
|
|
|
bfd_link_hash_lookup (&hash_table->root, shortname,
|
|
|
|
|
FALSE, FALSE, FALSE);
|
|
|
|
|
if (hi != NULL
|
|
|
|
|
&& hi->root.type == h->root.type
|
|
|
|
|
&& hi->root.u.def.value == h->root.u.def.value
|
|
|
|
|
&& hi->root.u.def.section == h->root.u.def.section)
|
|
|
|
|
{
|
|
|
|
|
(*bed->elf_backend_hide_symbol) (info, hi, TRUE);
|
|
|
|
|
hi->root.type = bfd_link_hash_indirect;
|
|
|
|
|
hi->root.u.i.link = (struct bfd_link_hash_entry *) h;
|
|
|
|
|
(*bed->elf_backend_copy_indirect_symbol) (bed, h, hi);
|
|
|
|
|
sym_hash = elf_sym_hashes (abfd);
|
|
|
|
|
if (sym_hash)
|
|
|
|
|
for (symidx = 0; symidx < extsymcount; ++symidx)
|
|
|
|
|
if (sym_hash[symidx] == hi)
|
|
|
|
|
{
|
|
|
|
|
sym_hash[symidx] = h;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
free (shortname);
|
|
|
|
|
}
|
|
|
|
|
free (nondeflt_vers);
|
|
|
|
|
nondeflt_vers = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (extversym != NULL)
|
|
|
|
|
{
|
|
|
|
|
free (extversym);
|
|
|
|
|
extversym = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isymbuf != NULL)
|
|
|
|
|
free (isymbuf);
|
|
|
|
|
isymbuf = NULL;
|
|
|
|
|
|
|
|
|
|
/* Now set the weakdefs field correctly for all the weak defined
|
|
|
|
|
symbols we found. The only way to do this is to search all the
|
|
|
|
|
symbols. Since we only need the information for non functions in
|
|
|
|
|
dynamic objects, that's the only time we actually put anything on
|
|
|
|
|
the list WEAKS. We need this information so that if a regular
|
|
|
|
|
object refers to a symbol defined weakly in a dynamic object, the
|
|
|
|
|
real symbol in the dynamic object is also put in the dynamic
|
|
|
|
|
symbols; we also must arrange for both symbols to point to the
|
|
|
|
|
same memory location. We could handle the general case of symbol
|
|
|
|
|
aliasing, but a general symbol alias can only be generated in
|
|
|
|
|
assembler code, handling it correctly would be very time
|
|
|
|
|
consuming, and other ELF linkers don't handle general aliasing
|
|
|
|
|
either. */
|
|
|
|
|
if (weaks != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry **hpp;
|
|
|
|
|
struct elf_link_hash_entry **hppend;
|
|
|
|
|
struct elf_link_hash_entry **sorted_sym_hash;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
size_t sym_count;
|
|
|
|
|
|
|
|
|
|
/* Since we have to search the whole symbol list for each weak
|
|
|
|
|
defined symbol, search time for N weak defined symbols will be
|
|
|
|
|
O(N^2). Binary search will cut it down to O(NlogN). */
|
|
|
|
|
amt = extsymcount * sizeof (struct elf_link_hash_entry *);
|
|
|
|
|
sorted_sym_hash = bfd_malloc (amt);
|
|
|
|
|
if (sorted_sym_hash == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
sym_hash = sorted_sym_hash;
|
|
|
|
|
hpp = elf_sym_hashes (abfd);
|
|
|
|
|
hppend = hpp + extsymcount;
|
|
|
|
|
sym_count = 0;
|
|
|
|
|
for (; hpp < hppend; hpp++)
|
|
|
|
|
{
|
|
|
|
|
h = *hpp;
|
|
|
|
|
if (h != NULL
|
|
|
|
|
&& h->root.type == bfd_link_hash_defined
|
|
|
|
|
&& h->type != STT_FUNC)
|
|
|
|
|
{
|
|
|
|
|
*sym_hash = h;
|
|
|
|
|
sym_hash++;
|
|
|
|
|
sym_count++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
qsort (sorted_sym_hash, sym_count,
|
|
|
|
|
sizeof (struct elf_link_hash_entry *),
|
|
|
|
|
elf_sort_symbol);
|
|
|
|
|
|
|
|
|
|
while (weaks != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *hlook;
|
|
|
|
|
asection *slook;
|
|
|
|
|
bfd_vma vlook;
|
|
|
|
|
long ilook;
|
|
|
|
|
size_t i, j, idx;
|
|
|
|
|
|
|
|
|
|
hlook = weaks;
|
|
|
|
|
weaks = hlook->weakdef;
|
|
|
|
|
hlook->weakdef = NULL;
|
|
|
|
|
|
|
|
|
|
BFD_ASSERT (hlook->root.type == bfd_link_hash_defined
|
|
|
|
|
|| hlook->root.type == bfd_link_hash_defweak
|
|
|
|
|
|| hlook->root.type == bfd_link_hash_common
|
|
|
|
|
|| hlook->root.type == bfd_link_hash_indirect);
|
|
|
|
|
slook = hlook->root.u.def.section;
|
|
|
|
|
vlook = hlook->root.u.def.value;
|
|
|
|
|
|
|
|
|
|
ilook = -1;
|
|
|
|
|
i = 0;
|
|
|
|
|
j = sym_count;
|
|
|
|
|
while (i < j)
|
|
|
|
|
{
|
|
|
|
|
bfd_signed_vma vdiff;
|
|
|
|
|
idx = (i + j) / 2;
|
|
|
|
|
h = sorted_sym_hash [idx];
|
|
|
|
|
vdiff = vlook - h->root.u.def.value;
|
|
|
|
|
if (vdiff < 0)
|
|
|
|
|
j = idx;
|
|
|
|
|
else if (vdiff > 0)
|
|
|
|
|
i = idx + 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
long sdiff = slook - h->root.u.def.section;
|
|
|
|
|
if (sdiff < 0)
|
|
|
|
|
j = idx;
|
|
|
|
|
else if (sdiff > 0)
|
|
|
|
|
i = idx + 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ilook = idx;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We didn't find a value/section match. */
|
|
|
|
|
if (ilook == -1)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
for (i = ilook; i < sym_count; i++)
|
|
|
|
|
{
|
|
|
|
|
h = sorted_sym_hash [i];
|
|
|
|
|
|
|
|
|
|
/* Stop if value or section doesn't match. */
|
|
|
|
|
if (h->root.u.def.value != vlook
|
|
|
|
|
|| h->root.u.def.section != slook)
|
|
|
|
|
break;
|
|
|
|
|
else if (h != hlook)
|
|
|
|
|
{
|
|
|
|
|
hlook->weakdef = h;
|
|
|
|
|
|
|
|
|
|
/* If the weak definition is in the list of dynamic
|
|
|
|
|
symbols, make sure the real definition is put
|
|
|
|
|
there as well. */
|
|
|
|
|
if (hlook->dynindx != -1 && h->dynindx == -1)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info,
|
|
|
|
|
h))
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the real definition is in the list of dynamic
|
|
|
|
|
symbols, make sure the weak definition is put
|
|
|
|
|
there as well. If we don't do this, then the
|
|
|
|
|
dynamic loader might not merge the entries for the
|
|
|
|
|
real definition and the weak definition. */
|
|
|
|
|
if (h->dynindx != -1 && hlook->dynindx == -1)
|
|
|
|
|
{
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info,
|
|
|
|
|
hlook))
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (sorted_sym_hash);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this object is the same format as the output object, and it is
|
|
|
|
|
not a shared library, then let the backend look through the
|
|
|
|
|
relocs.
|
|
|
|
|
|
|
|
|
|
This is required to build global offset table entries and to
|
|
|
|
|
arrange for dynamic relocs. It is not required for the
|
|
|
|
|
particular common case of linking non PIC code, even when linking
|
|
|
|
|
against shared libraries, but unfortunately there is no way of
|
|
|
|
|
knowing whether an object file has been compiled PIC or not.
|
|
|
|
|
Looking through the relocs is not particularly time consuming.
|
|
|
|
|
The problem is that we must either (1) keep the relocs in memory,
|
|
|
|
|
which causes the linker to require additional runtime memory or
|
|
|
|
|
(2) read the relocs twice from the input file, which wastes time.
|
|
|
|
|
This would be a good case for using mmap.
|
|
|
|
|
|
|
|
|
|
I have no idea how to handle linking PIC code into a file of a
|
|
|
|
|
different format. It probably can't be done. */
|
|
|
|
|
check_relocs = get_elf_backend_data (abfd)->check_relocs;
|
|
|
|
|
if (! dynamic
|
|
|
|
|
&& is_elf_hash_table (hash_table)
|
|
|
|
|
&& hash_table->root.creator == abfd->xvec
|
|
|
|
|
&& check_relocs != NULL)
|
|
|
|
|
{
|
|
|
|
|
asection *o;
|
|
|
|
|
|
|
|
|
|
for (o = abfd->sections; o != NULL; o = o->next)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Rela *internal_relocs;
|
|
|
|
|
bfd_boolean ok;
|
|
|
|
|
|
|
|
|
|
if ((o->flags & SEC_RELOC) == 0
|
|
|
|
|
|| o->reloc_count == 0
|
|
|
|
|
|| ((info->strip == strip_all || info->strip == strip_debugger)
|
|
|
|
|
&& (o->flags & SEC_DEBUGGING) != 0)
|
|
|
|
|
|| bfd_is_abs_section (o->output_section))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
internal_relocs = _bfd_elf_link_read_relocs (abfd, o, NULL, NULL,
|
|
|
|
|
info->keep_memory);
|
|
|
|
|
if (internal_relocs == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
ok = (*check_relocs) (abfd, info, o, internal_relocs);
|
|
|
|
|
|
|
|
|
|
if (elf_section_data (o)->relocs != internal_relocs)
|
|
|
|
|
free (internal_relocs);
|
|
|
|
|
|
|
|
|
|
if (! ok)
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If this is a non-traditional link, try to optimize the handling
|
|
|
|
|
of the .stab/.stabstr sections. */
|
|
|
|
|
if (! dynamic
|
|
|
|
|
&& ! info->traditional_format
|
|
|
|
|
&& is_elf_hash_table (hash_table)
|
|
|
|
|
&& (info->strip != strip_all && info->strip != strip_debugger))
|
|
|
|
|
{
|
|
|
|
|
asection *stabstr;
|
|
|
|
|
|
|
|
|
|
stabstr = bfd_get_section_by_name (abfd, ".stabstr");
|
|
|
|
|
if (stabstr != NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type string_offset = 0;
|
|
|
|
|
asection *stab;
|
|
|
|
|
|
|
|
|
|
for (stab = abfd->sections; stab; stab = stab->next)
|
|
|
|
|
if (strncmp (".stab", stab->name, 5) == 0
|
|
|
|
|
&& (!stab->name[5] ||
|
|
|
|
|
(stab->name[5] == '.' && ISDIGIT (stab->name[6])))
|
|
|
|
|
&& (stab->flags & SEC_MERGE) == 0
|
|
|
|
|
&& !bfd_is_abs_section (stab->output_section))
|
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_section_data *secdata;
|
|
|
|
|
|
|
|
|
|
secdata = elf_section_data (stab);
|
|
|
|
|
if (! _bfd_link_section_stabs (abfd,
|
|
|
|
|
& hash_table->stab_info,
|
|
|
|
|
stab, stabstr,
|
|
|
|
|
&secdata->sec_info,
|
|
|
|
|
&string_offset))
|
|
|
|
|
goto error_return;
|
|
|
|
|
if (secdata->sec_info)
|
|
|
|
|
stab->sec_info_type = ELF_INFO_TYPE_STABS;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! info->relocatable
|
|
|
|
|
&& ! dynamic
|
|
|
|
|
&& is_elf_hash_table (hash_table))
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
|
|
|
|
|
for (s = abfd->sections; s != NULL; s = s->next)
|
|
|
|
|
if ((s->flags & SEC_MERGE) != 0
|
|
|
|
|
&& !bfd_is_abs_section (s->output_section))
|
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_section_data *secdata;
|
|
|
|
|
|
|
|
|
|
secdata = elf_section_data (s);
|
|
|
|
|
if (! _bfd_merge_section (abfd,
|
|
|
|
|
& hash_table->merge_info,
|
|
|
|
|
s, &secdata->sec_info))
|
|
|
|
|
goto error_return;
|
|
|
|
|
else if (secdata->sec_info)
|
|
|
|
|
s->sec_info_type = ELF_INFO_TYPE_MERGE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_elf_hash_table (hash_table))
|
|
|
|
|
{
|
|
|
|
|
/* Add this bfd to the loaded list. */
|
|
|
|
|
struct elf_link_loaded_list *n;
|
|
|
|
|
|
|
|
|
|
n = bfd_alloc (abfd, sizeof (struct elf_link_loaded_list));
|
|
|
|
|
if (n == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
n->abfd = abfd;
|
|
|
|
|
n->next = hash_table->loaded;
|
|
|
|
|
hash_table->loaded = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
error_free_vers:
|
|
|
|
|
if (nondeflt_vers != NULL)
|
|
|
|
|
free (nondeflt_vers);
|
|
|
|
|
if (extversym != NULL)
|
|
|
|
|
free (extversym);
|
|
|
|
|
error_free_sym:
|
|
|
|
|
if (isymbuf != NULL)
|
|
|
|
|
free (isymbuf);
|
|
|
|
|
error_return:
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-29 14:11:52 +08:00
|
|
|
|
/* Add symbols from an ELF archive file to the linker hash table. We
|
|
|
|
|
don't use _bfd_generic_link_add_archive_symbols because of a
|
|
|
|
|
problem which arises on UnixWare. The UnixWare libc.so is an
|
|
|
|
|
archive which includes an entry libc.so.1 which defines a bunch of
|
|
|
|
|
symbols. The libc.so archive also includes a number of other
|
|
|
|
|
object files, which also define symbols, some of which are the same
|
|
|
|
|
as those defined in libc.so.1. Correct linking requires that we
|
|
|
|
|
consider each object file in turn, and include it if it defines any
|
|
|
|
|
symbols we need. _bfd_generic_link_add_archive_symbols does not do
|
|
|
|
|
this; it looks through the list of undefined symbols, and includes
|
|
|
|
|
any object file which defines them. When this algorithm is used on
|
|
|
|
|
UnixWare, it winds up pulling in libc.so.1 early and defining a
|
|
|
|
|
bunch of symbols. This means that some of the other objects in the
|
|
|
|
|
archive are not included in the link, which is incorrect since they
|
|
|
|
|
precede libc.so.1 in the archive.
|
|
|
|
|
|
|
|
|
|
Fortunately, ELF archive handling is simpler than that done by
|
|
|
|
|
_bfd_generic_link_add_archive_symbols, which has to allow for a.out
|
|
|
|
|
oddities. In ELF, if we find a symbol in the archive map, and the
|
|
|
|
|
symbol is currently undefined, we know that we must pull in that
|
|
|
|
|
object file.
|
|
|
|
|
|
|
|
|
|
Unfortunately, we do have to make multiple passes over the symbol
|
|
|
|
|
table until nothing further is resolved. */
|
|
|
|
|
|
2004-03-26 13:55:15 +08:00
|
|
|
|
static bfd_boolean
|
|
|
|
|
elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
|
2004-02-29 14:11:52 +08:00
|
|
|
|
{
|
|
|
|
|
symindex c;
|
|
|
|
|
bfd_boolean *defined = NULL;
|
|
|
|
|
bfd_boolean *included = NULL;
|
|
|
|
|
carsym *symdefs;
|
|
|
|
|
bfd_boolean loop;
|
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
|
|
if (! bfd_has_map (abfd))
|
|
|
|
|
{
|
|
|
|
|
/* An empty archive is a special case. */
|
|
|
|
|
if (bfd_openr_next_archived_file (abfd, NULL) == NULL)
|
|
|
|
|
return TRUE;
|
|
|
|
|
bfd_set_error (bfd_error_no_armap);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Keep track of all symbols we know to be already defined, and all
|
|
|
|
|
files we know to be already included. This is to speed up the
|
|
|
|
|
second and subsequent passes. */
|
|
|
|
|
c = bfd_ardata (abfd)->symdef_count;
|
|
|
|
|
if (c == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
amt = c;
|
|
|
|
|
amt *= sizeof (bfd_boolean);
|
|
|
|
|
defined = bfd_zmalloc (amt);
|
|
|
|
|
included = bfd_zmalloc (amt);
|
|
|
|
|
if (defined == NULL || included == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
symdefs = bfd_ardata (abfd)->symdefs;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
file_ptr last;
|
|
|
|
|
symindex i;
|
|
|
|
|
carsym *symdef;
|
|
|
|
|
carsym *symdefend;
|
|
|
|
|
|
|
|
|
|
loop = FALSE;
|
|
|
|
|
last = -1;
|
|
|
|
|
|
|
|
|
|
symdef = symdefs;
|
|
|
|
|
symdefend = symdef + c;
|
|
|
|
|
for (i = 0; symdef < symdefend; symdef++, i++)
|
|
|
|
|
{
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
bfd *element;
|
|
|
|
|
struct bfd_link_hash_entry *undefs_tail;
|
|
|
|
|
symindex mark;
|
|
|
|
|
|
|
|
|
|
if (defined[i] || included[i])
|
|
|
|
|
continue;
|
|
|
|
|
if (symdef->file_offset == last)
|
|
|
|
|
{
|
|
|
|
|
included[i] = TRUE;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
h = elf_link_hash_lookup (elf_hash_table (info), symdef->name,
|
|
|
|
|
FALSE, FALSE, FALSE);
|
|
|
|
|
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
{
|
|
|
|
|
char *p, *copy;
|
|
|
|
|
size_t len, first;
|
|
|
|
|
|
|
|
|
|
/* If this is a default version (the name contains @@),
|
|
|
|
|
look up the symbol again with only one `@' as well
|
|
|
|
|
as without the version. The effect is that references
|
|
|
|
|
to the symbol with and without the version will be
|
|
|
|
|
matched by the default symbol in the archive. */
|
|
|
|
|
|
|
|
|
|
p = strchr (symdef->name, ELF_VER_CHR);
|
|
|
|
|
if (p == NULL || p[1] != ELF_VER_CHR)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* First check with only one `@'. */
|
|
|
|
|
len = strlen (symdef->name);
|
|
|
|
|
copy = bfd_alloc (abfd, len);
|
|
|
|
|
if (copy == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
first = p - symdef->name + 1;
|
|
|
|
|
memcpy (copy, symdef->name, first);
|
|
|
|
|
memcpy (copy + first, symdef->name + first + 1, len - first);
|
|
|
|
|
|
|
|
|
|
h = elf_link_hash_lookup (elf_hash_table (info), copy,
|
|
|
|
|
FALSE, FALSE, FALSE);
|
|
|
|
|
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* We also need to check references to the symbol
|
|
|
|
|
without the version. */
|
|
|
|
|
|
|
|
|
|
copy[first - 1] = '\0';
|
|
|
|
|
h = elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
|
copy, FALSE, FALSE, FALSE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bfd_release (abfd, copy);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (h == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_common)
|
|
|
|
|
{
|
|
|
|
|
/* We currently have a common symbol. The archive map contains
|
|
|
|
|
a reference to this symbol, so we may want to include it. We
|
|
|
|
|
only want to include it however, if this archive element
|
|
|
|
|
contains a definition of the symbol, not just another common
|
|
|
|
|
declaration of it.
|
|
|
|
|
|
|
|
|
|
Unfortunately some archivers (including GNU ar) will put
|
|
|
|
|
declarations of common symbols into their archive maps, as
|
|
|
|
|
well as real definitions, so we cannot just go by the archive
|
|
|
|
|
map alone. Instead we must read in the element's symbol
|
|
|
|
|
table and check that to see what kind of symbol definition
|
|
|
|
|
this is. */
|
|
|
|
|
if (! elf_link_is_defined_archive_symbol (abfd, symdef))
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (h->root.type != bfd_link_hash_undefined)
|
|
|
|
|
{
|
|
|
|
|
if (h->root.type != bfd_link_hash_undefweak)
|
|
|
|
|
defined[i] = TRUE;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We need to include this archive member. */
|
|
|
|
|
element = _bfd_get_elt_at_filepos (abfd, symdef->file_offset);
|
|
|
|
|
if (element == NULL)
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
if (! bfd_check_format (element, bfd_object))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* Doublecheck that we have not included this object
|
|
|
|
|
already--it should be impossible, but there may be
|
|
|
|
|
something wrong with the archive. */
|
|
|
|
|
if (element->archive_pass != 0)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
goto error_return;
|
|
|
|
|
}
|
|
|
|
|
element->archive_pass = 1;
|
|
|
|
|
|
|
|
|
|
undefs_tail = info->hash->undefs_tail;
|
|
|
|
|
|
|
|
|
|
if (! (*info->callbacks->add_archive_element) (info, element,
|
|
|
|
|
symdef->name))
|
|
|
|
|
goto error_return;
|
|
|
|
|
if (! bfd_link_add_symbols (element, info))
|
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
|
|
/* If there are any new undefined symbols, we need to make
|
|
|
|
|
another pass through the archive in order to see whether
|
|
|
|
|
they can be defined. FIXME: This isn't perfect, because
|
|
|
|
|
common symbols wind up on undefs_tail and because an
|
|
|
|
|
undefined symbol which is defined later on in this pass
|
|
|
|
|
does not require another pass. This isn't a bug, but it
|
|
|
|
|
does make the code less efficient than it could be. */
|
|
|
|
|
if (undefs_tail != info->hash->undefs_tail)
|
|
|
|
|
loop = TRUE;
|
|
|
|
|
|
|
|
|
|
/* Look backward to mark all symbols from this object file
|
|
|
|
|
which we have already seen in this pass. */
|
|
|
|
|
mark = i;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
included[mark] = TRUE;
|
|
|
|
|
if (mark == 0)
|
|
|
|
|
break;
|
|
|
|
|
--mark;
|
|
|
|
|
}
|
|
|
|
|
while (symdefs[mark].file_offset == symdef->file_offset);
|
|
|
|
|
|
|
|
|
|
/* We mark subsequent symbols from this object file as we go
|
|
|
|
|
on through the loop. */
|
|
|
|
|
last = symdef->file_offset;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (loop);
|
|
|
|
|
|
|
|
|
|
free (defined);
|
|
|
|
|
free (included);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
|
if (defined != NULL)
|
|
|
|
|
free (defined);
|
|
|
|
|
if (included != NULL)
|
|
|
|
|
free (included);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
2004-03-26 13:55:15 +08:00
|
|
|
|
|
|
|
|
|
/* Given an ELF BFD, add symbols to the global hash table as
|
|
|
|
|
appropriate. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
|
bfd_elf_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
switch (bfd_get_format (abfd))
|
|
|
|
|
{
|
|
|
|
|
case bfd_object:
|
|
|
|
|
return elf_link_add_object_symbols (abfd, info);
|
|
|
|
|
case bfd_archive:
|
|
|
|
|
return elf_link_add_archive_symbols (abfd, info);
|
|
|
|
|
default:
|
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-03-25 20:48:45 +08:00
|
|
|
|
|
|
|
|
|
/* This function will be called though elf_link_hash_traverse to store
|
|
|
|
|
all hash value of the exported symbols in an array. */
|
|
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
|
elf_collect_hash_codes (struct elf_link_hash_entry *h, void *data)
|
|
|
|
|
{
|
|
|
|
|
unsigned long **valuep = data;
|
|
|
|
|
const char *name;
|
|
|
|
|
char *p;
|
|
|
|
|
unsigned long ha;
|
|
|
|
|
char *alc = NULL;
|
|
|
|
|
|
|
|
|
|
if (h->root.type == bfd_link_hash_warning)
|
|
|
|
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
|
|
|
|
|
|
|
|
|
/* Ignore indirect symbols. These are added by the versioning code. */
|
|
|
|
|
if (h->dynindx == -1)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
name = h->root.root.string;
|
|
|
|
|
p = strchr (name, ELF_VER_CHR);
|
|
|
|
|
if (p != NULL)
|
|
|
|
|
{
|
|
|
|
|
alc = bfd_malloc (p - name + 1);
|
|
|
|
|
memcpy (alc, name, p - name);
|
|
|
|
|
alc[p - name] = '\0';
|
|
|
|
|
name = alc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute the hash value. */
|
|
|
|
|
ha = bfd_elf_hash (name);
|
|
|
|
|
|
|
|
|
|
/* Store the found hash value in the array given as the argument. */
|
|
|
|
|
*(*valuep)++ = ha;
|
|
|
|
|
|
|
|
|
|
/* And store it in the struct so that we can put it in the hash table
|
|
|
|
|
later. */
|
|
|
|
|
h->elf_hash_value = ha;
|
|
|
|
|
|
|
|
|
|
if (alc != NULL)
|
|
|
|
|
free (alc);
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Array used to determine the number of hash table buckets to use
|
|
|
|
|
based on the number of symbols there are. If there are fewer than
|
|
|
|
|
3 symbols we use 1 bucket, fewer than 17 symbols we use 3 buckets,
|
|
|
|
|
fewer than 37 we use 17 buckets, and so forth. We never use more
|
|
|
|
|
than 32771 buckets. */
|
|
|
|
|
|
|
|
|
|
static const size_t elf_buckets[] =
|
|
|
|
|
{
|
|
|
|
|
1, 3, 17, 37, 67, 97, 131, 197, 263, 521, 1031, 2053, 4099, 8209,
|
|
|
|
|
16411, 32771, 0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Compute bucket count for hashing table. We do not use a static set
|
|
|
|
|
of possible tables sizes anymore. Instead we determine for all
|
|
|
|
|
possible reasonable sizes of the table the outcome (i.e., the
|
|
|
|
|
number of collisions etc) and choose the best solution. The
|
|
|
|
|
weighting functions are not too simple to allow the table to grow
|
|
|
|
|
without bounds. Instead one of the weighting factors is the size.
|
|
|
|
|
Therefore the result is always a good payoff between few collisions
|
|
|
|
|
(= short chain lengths) and table size. */
|
|
|
|
|
static size_t
|
|
|
|
|
compute_bucket_count (struct bfd_link_info *info)
|
|
|
|
|
{
|
|
|
|
|
size_t dynsymcount = elf_hash_table (info)->dynsymcount;
|
|
|
|
|
size_t best_size = 0;
|
|
|
|
|
unsigned long int *hashcodes;
|
|
|
|
|
unsigned long int *hashcodesp;
|
|
|
|
|
unsigned long int i;
|
|
|
|
|
bfd_size_type amt;
|
|
|
|
|
|
|
|
|
|
/* Compute the hash values for all exported symbols. At the same
|
|
|
|
|
time store the values in an array so that we could use them for
|
|
|
|
|
optimizations. */
|
|
|
|
|
amt = dynsymcount;
|
|
|
|
|
amt *= sizeof (unsigned long int);
|
|
|
|
|
hashcodes = bfd_malloc (amt);
|
|
|
|
|
if (hashcodes == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
hashcodesp = hashcodes;
|
|
|
|
|
|
|
|
|
|
/* Put all hash values in HASHCODES. */
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
elf_collect_hash_codes, &hashcodesp);
|
|
|
|
|
|
|
|
|
|
/* We have a problem here. The following code to optimize the table
|
|
|
|
|
size requires an integer type with more the 32 bits. If
|
|
|
|
|
BFD_HOST_U_64_BIT is set we know about such a type. */
|
|
|
|
|
#ifdef BFD_HOST_U_64_BIT
|
|
|
|
|
if (info->optimize)
|
|
|
|
|
{
|
|
|
|
|
unsigned long int nsyms = hashcodesp - hashcodes;
|
|
|
|
|
size_t minsize;
|
|
|
|
|
size_t maxsize;
|
|
|
|
|
BFD_HOST_U_64_BIT best_chlen = ~((BFD_HOST_U_64_BIT) 0);
|
|
|
|
|
unsigned long int *counts ;
|
|
|
|
|
bfd *dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
|
|
|
|
|
|
|
|
|
|
/* Possible optimization parameters: if we have NSYMS symbols we say
|
|
|
|
|
that the hashing table must at least have NSYMS/4 and at most
|
|
|
|
|
2*NSYMS buckets. */
|
|
|
|
|
minsize = nsyms / 4;
|
|
|
|
|
if (minsize == 0)
|
|
|
|
|
minsize = 1;
|
|
|
|
|
best_size = maxsize = nsyms * 2;
|
|
|
|
|
|
|
|
|
|
/* Create array where we count the collisions in. We must use bfd_malloc
|
|
|
|
|
since the size could be large. */
|
|
|
|
|
amt = maxsize;
|
|
|
|
|
amt *= sizeof (unsigned long int);
|
|
|
|
|
counts = bfd_malloc (amt);
|
|
|
|
|
if (counts == NULL)
|
|
|
|
|
{
|
|
|
|
|
free (hashcodes);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute the "optimal" size for the hash table. The criteria is a
|
|
|
|
|
minimal chain length. The minor criteria is (of course) the size
|
|
|
|
|
of the table. */
|
|
|
|
|
for (i = minsize; i < maxsize; ++i)
|
|
|
|
|
{
|
|
|
|
|
/* Walk through the array of hashcodes and count the collisions. */
|
|
|
|
|
BFD_HOST_U_64_BIT max;
|
|
|
|
|
unsigned long int j;
|
|
|
|
|
unsigned long int fact;
|
|
|
|
|
|
|
|
|
|
memset (counts, '\0', i * sizeof (unsigned long int));
|
|
|
|
|
|
|
|
|
|
/* Determine how often each hash bucket is used. */
|
|
|
|
|
for (j = 0; j < nsyms; ++j)
|
|
|
|
|
++counts[hashcodes[j] % i];
|
|
|
|
|
|
|
|
|
|
/* For the weight function we need some information about the
|
|
|
|
|
pagesize on the target. This is information need not be 100%
|
|
|
|
|
accurate. Since this information is not available (so far) we
|
|
|
|
|
define it here to a reasonable default value. If it is crucial
|
|
|
|
|
to have a better value some day simply define this value. */
|
|
|
|
|
# ifndef BFD_TARGET_PAGESIZE
|
|
|
|
|
# define BFD_TARGET_PAGESIZE (4096)
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
/* We in any case need 2 + NSYMS entries for the size values and
|
|
|
|
|
the chains. */
|
|
|
|
|
max = (2 + nsyms) * (bed->s->arch_size / 8);
|
|
|
|
|
|
|
|
|
|
# if 1
|
|
|
|
|
/* Variant 1: optimize for short chains. We add the squares
|
|
|
|
|
of all the chain lengths (which favors many small chain
|
|
|
|
|
over a few long chains). */
|
|
|
|
|
for (j = 0; j < i; ++j)
|
|
|
|
|
max += counts[j] * counts[j];
|
|
|
|
|
|
|
|
|
|
/* This adds penalties for the overall size of the table. */
|
|
|
|
|
fact = i / (BFD_TARGET_PAGESIZE / (bed->s->arch_size / 8)) + 1;
|
|
|
|
|
max *= fact * fact;
|
|
|
|
|
# else
|
|
|
|
|
/* Variant 2: Optimize a lot more for small table. Here we
|
|
|
|
|
also add squares of the size but we also add penalties for
|
|
|
|
|
empty slots (the +1 term). */
|
|
|
|
|
for (j = 0; j < i; ++j)
|
|
|
|
|
max += (1 + counts[j]) * (1 + counts[j]);
|
|
|
|
|
|
|
|
|
|
/* The overall size of the table is considered, but not as
|
|
|
|
|
strong as in variant 1, where it is squared. */
|
|
|
|
|
fact = i / (BFD_TARGET_PAGESIZE / (bed->s->arch_size / 8)) + 1;
|
|
|
|
|
max *= fact;
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
/* Compare with current best results. */
|
|
|
|
|
if (max < best_chlen)
|
|
|
|
|
{
|
|
|
|
|
best_chlen = max;
|
|
|
|
|
best_size = i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (counts);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif /* defined (BFD_HOST_U_64_BIT) */
|
|
|
|
|
{
|
|
|
|
|
/* This is the fallback solution if no 64bit type is available or if we
|
|
|
|
|
are not supposed to spend much time on optimizations. We select the
|
|
|
|
|
bucket count using a fixed set of numbers. */
|
|
|
|
|
for (i = 0; elf_buckets[i] != 0; i++)
|
|
|
|
|
{
|
|
|
|
|
best_size = elf_buckets[i];
|
|
|
|
|
if (dynsymcount < elf_buckets[i + 1])
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free the arrays we needed. */
|
|
|
|
|
free (hashcodes);
|
|
|
|
|
|
|
|
|
|
return best_size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set up the sizes and contents of the ELF dynamic sections. This is
|
|
|
|
|
called by the ELF linker emulation before_allocation routine. We
|
|
|
|
|
must set the sizes of the sections before the linker sets the
|
|
|
|
|
addresses of the various sections. */
|
|
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
|
bfd_elf_size_dynamic_sections (bfd *output_bfd,
|
|
|
|
|
const char *soname,
|
|
|
|
|
const char *rpath,
|
|
|
|
|
const char *filter_shlib,
|
|
|
|
|
const char * const *auxiliary_filters,
|
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
|
asection **sinterpptr,
|
|
|
|
|
struct bfd_elf_version_tree *verdefs)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type soname_indx;
|
|
|
|
|
bfd *dynobj;
|
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
|
struct elf_assign_sym_version_info asvinfo;
|
|
|
|
|
|
|
|
|
|
*sinterpptr = NULL;
|
|
|
|
|
|
|
|
|
|
soname_indx = (bfd_size_type) -1;
|
|
|
|
|
|
|
|
|
|
if (!is_elf_hash_table (info->hash))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if (info->execstack)
|
|
|
|
|
elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X;
|
|
|
|
|
else if (info->noexecstack)
|
|
|
|
|
elf_tdata (output_bfd)->stack_flags = PF_R | PF_W;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bfd *inputobj;
|
|
|
|
|
asection *notesec = NULL;
|
|
|
|
|
int exec = 0;
|
|
|
|
|
|
|
|
|
|
for (inputobj = info->input_bfds;
|
|
|
|
|
inputobj;
|
|
|
|
|
inputobj = inputobj->link_next)
|
|
|
|
|
{
|
|
|
|
|
asection *s;
|
|
|
|
|
|
|
|
|
|
if (inputobj->flags & DYNAMIC)
|
|
|
|
|
continue;
|
|
|
|
|
s = bfd_get_section_by_name (inputobj, ".note.GNU-stack");
|
|
|
|
|
if (s)
|
|
|
|
|
{
|
|
|
|
|
if (s->flags & SEC_CODE)
|
|
|
|
|
exec = PF_X;
|
|
|
|
|
notesec = s;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
exec = PF_X;
|
|
|
|
|
}
|
|
|
|
|
if (notesec)
|
|
|
|
|
{
|
|
|
|
|
elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | exec;
|
|
|
|
|
if (exec && info->relocatable
|
|
|
|
|
&& notesec->output_section != bfd_abs_section_ptr)
|
|
|
|
|
notesec->output_section->flags |= SEC_CODE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Any syms created from now on start with -1 in
|
|
|
|
|
got.refcount/offset and plt.refcount/offset. */
|
|
|
|
|
elf_hash_table (info)->init_refcount = elf_hash_table (info)->init_offset;
|
|
|
|
|
|
|
|
|
|
/* The backend may have to create some sections regardless of whether
|
|
|
|
|
we're dynamic or not. */
|
|
|
|
|
bed = get_elf_backend_data (output_bfd);
|
|
|
|
|
if (bed->elf_backend_always_size_sections
|
|
|
|
|
&& ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
dynobj = elf_hash_table (info)->dynobj;
|
|
|
|
|
|
|
|
|
|
/* If there were no dynamic objects in the link, there is nothing to
|
|
|
|
|
do here. */
|
|
|
|
|
if (dynobj == NULL)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if (! _bfd_elf_maybe_strip_eh_frame_hdr (info))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
|
{
|
|
|
|
|
struct elf_info_failed eif;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
asection *dynstr;
|
|
|
|
|
struct bfd_elf_version_tree *t;
|
|
|
|
|
struct bfd_elf_version_expr *d;
|
|
|
|
|
bfd_boolean all_defined;
|
|
|
|
|
|
|
|
|
|
*sinterpptr = bfd_get_section_by_name (dynobj, ".interp");
|
|
|
|
|
BFD_ASSERT (*sinterpptr != NULL || !info->executable);
|
|
|
|
|
|
|
|
|
|
if (soname != NULL)
|
|
|
|
|
{
|
|
|
|
|
soname_indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
|
|
|
|
|
soname, TRUE);
|
|
|
|
|
if (soname_indx == (bfd_size_type) -1
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_SONAME, soname_indx))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (info->symbolic)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_SYMBOLIC, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
info->flags |= DF_SYMBOLIC;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (rpath != NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type indx;
|
|
|
|
|
|
|
|
|
|
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr, rpath,
|
|
|
|
|
TRUE);
|
|
|
|
|
if (indx == (bfd_size_type) -1
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_RPATH, indx))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (info->new_dtags)
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_strtab_addref (elf_hash_table (info)->dynstr, indx);
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_RUNPATH, indx))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (filter_shlib != NULL)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type indx;
|
|
|
|
|
|
|
|
|
|
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
|
|
|
|
|
filter_shlib, TRUE);
|
|
|
|
|
if (indx == (bfd_size_type) -1
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_FILTER, indx))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (auxiliary_filters != NULL)
|
|
|
|
|
{
|
|
|
|
|
const char * const *p;
|
|
|
|
|
|
|
|
|
|
for (p = auxiliary_filters; *p != NULL; p++)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type indx;
|
|
|
|
|
|
|
|
|
|
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
|
|
|
|
|
*p, TRUE);
|
|
|
|
|
if (indx == (bfd_size_type) -1
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_AUXILIARY, indx))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
eif.info = info;
|
|
|
|
|
eif.verdefs = verdefs;
|
|
|
|
|
eif.failed = FALSE;
|
|
|
|
|
|
|
|
|
|
/* If we are supposed to export all symbols into the dynamic symbol
|
|
|
|
|
table (this is not the normal case), then do so. */
|
|
|
|
|
if (info->export_dynamic)
|
|
|
|
|
{
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
_bfd_elf_export_symbol,
|
|
|
|
|
&eif);
|
|
|
|
|
if (eif.failed)
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make all global versions with definition. */
|
|
|
|
|
for (t = verdefs; t != NULL; t = t->next)
|
|
|
|
|
for (d = t->globals.list; d != NULL; d = d->next)
|
|
|
|
|
if (!d->symver && d->symbol)
|
|
|
|
|
{
|
|
|
|
|
const char *verstr, *name;
|
|
|
|
|
size_t namelen, verlen, newlen;
|
|
|
|
|
char *newname, *p;
|
|
|
|
|
struct elf_link_hash_entry *newh;
|
|
|
|
|
|
|
|
|
|
name = d->symbol;
|
|
|
|
|
namelen = strlen (name);
|
|
|
|
|
verstr = t->name;
|
|
|
|
|
verlen = strlen (verstr);
|
|
|
|
|
newlen = namelen + verlen + 3;
|
|
|
|
|
|
|
|
|
|
newname = bfd_malloc (newlen);
|
|
|
|
|
if (newname == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
memcpy (newname, name, namelen);
|
|
|
|
|
|
|
|
|
|
/* Check the hidden versioned definition. */
|
|
|
|
|
p = newname + namelen;
|
|
|
|
|
*p++ = ELF_VER_CHR;
|
|
|
|
|
memcpy (p, verstr, verlen + 1);
|
|
|
|
|
newh = elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
|
newname, FALSE, FALSE,
|
|
|
|
|
FALSE);
|
|
|
|
|
if (newh == NULL
|
|
|
|
|
|| (newh->root.type != bfd_link_hash_defined
|
|
|
|
|
&& newh->root.type != bfd_link_hash_defweak))
|
|
|
|
|
{
|
|
|
|
|
/* Check the default versioned definition. */
|
|
|
|
|
*p++ = ELF_VER_CHR;
|
|
|
|
|
memcpy (p, verstr, verlen + 1);
|
|
|
|
|
newh = elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
|
newname, FALSE, FALSE,
|
|
|
|
|
FALSE);
|
|
|
|
|
}
|
|
|
|
|
free (newname);
|
|
|
|
|
|
|
|
|
|
/* Mark this version if there is a definition and it is
|
|
|
|
|
not defined in a shared object. */
|
|
|
|
|
if (newh != NULL
|
|
|
|
|
&& ((newh->elf_link_hash_flags
|
|
|
|
|
& ELF_LINK_HASH_DEF_DYNAMIC) == 0)
|
|
|
|
|
&& (newh->root.type == bfd_link_hash_defined
|
|
|
|
|
|| newh->root.type == bfd_link_hash_defweak))
|
|
|
|
|
d->symver = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Attach all the symbols to their version information. */
|
|
|
|
|
asvinfo.output_bfd = output_bfd;
|
|
|
|
|
asvinfo.info = info;
|
|
|
|
|
asvinfo.verdefs = verdefs;
|
|
|
|
|
asvinfo.failed = FALSE;
|
|
|
|
|
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
_bfd_elf_link_assign_sym_version,
|
|
|
|
|
&asvinfo);
|
|
|
|
|
if (asvinfo.failed)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!info->allow_undefined_version)
|
|
|
|
|
{
|
|
|
|
|
/* Check if all global versions have a definition. */
|
|
|
|
|
all_defined = TRUE;
|
|
|
|
|
for (t = verdefs; t != NULL; t = t->next)
|
|
|
|
|
for (d = t->globals.list; d != NULL; d = d->next)
|
|
|
|
|
if (!d->symver && !d->script)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: undefined version: %s"),
|
|
|
|
|
d->pattern, t->name);
|
|
|
|
|
all_defined = FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!all_defined)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find all symbols which were defined in a dynamic object and make
|
|
|
|
|
the backend pick a reasonable value for them. */
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
_bfd_elf_adjust_dynamic_symbol,
|
|
|
|
|
&eif);
|
|
|
|
|
if (eif.failed)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Add some entries to the .dynamic section. We fill in some of the
|
|
|
|
|
values later, in elf_bfd_final_link, but we must add the entries
|
|
|
|
|
now so that we know the final size of the .dynamic section. */
|
|
|
|
|
|
|
|
|
|
/* If there are initialization and/or finalization functions to
|
|
|
|
|
call then add the corresponding DT_INIT/DT_FINI entries. */
|
|
|
|
|
h = (info->init_function
|
|
|
|
|
? elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
|
info->init_function, FALSE,
|
|
|
|
|
FALSE, FALSE)
|
|
|
|
|
: NULL);
|
|
|
|
|
if (h != NULL
|
|
|
|
|
&& (h->elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR
|
|
|
|
|
| ELF_LINK_HASH_DEF_REGULAR)) != 0)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_INIT, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
h = (info->fini_function
|
|
|
|
|
? elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
|
info->fini_function, FALSE,
|
|
|
|
|
FALSE, FALSE)
|
|
|
|
|
: NULL);
|
|
|
|
|
if (h != NULL
|
|
|
|
|
&& (h->elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR
|
|
|
|
|
| ELF_LINK_HASH_DEF_REGULAR)) != 0)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_FINI, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bfd_get_section_by_name (output_bfd, ".preinit_array") != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* DT_PREINIT_ARRAY is not allowed in shared library. */
|
|
|
|
|
if (! info->executable)
|
|
|
|
|
{
|
|
|
|
|
bfd *sub;
|
|
|
|
|
asection *o;
|
|
|
|
|
|
|
|
|
|
for (sub = info->input_bfds; sub != NULL;
|
|
|
|
|
sub = sub->link_next)
|
|
|
|
|
for (o = sub->sections; o != NULL; o = o->next)
|
|
|
|
|
if (elf_section_data (o)->this_hdr.sh_type
|
|
|
|
|
== SHT_PREINIT_ARRAY)
|
|
|
|
|
{
|
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
|
(_("%s: .preinit_array section is not allowed in DSO"),
|
|
|
|
|
bfd_archive_filename (sub));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bfd_set_error (bfd_error_nonrepresentable_section);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_PREINIT_ARRAY, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_PREINIT_ARRAYSZ, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
if (bfd_get_section_by_name (output_bfd, ".init_array") != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_INIT_ARRAY, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_INIT_ARRAYSZ, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
if (bfd_get_section_by_name (output_bfd, ".fini_array") != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_FINI_ARRAY, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_FINI_ARRAYSZ, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dynstr = bfd_get_section_by_name (dynobj, ".dynstr");
|
|
|
|
|
/* If .dynstr is excluded from the link, we don't want any of
|
|
|
|
|
these tags. Strictly, we should be checking each section
|
|
|
|
|
individually; This quick check covers for the case where
|
|
|
|
|
someone does a /DISCARD/ : { *(*) }. */
|
|
|
|
|
if (dynstr != NULL && dynstr->output_section != bfd_abs_section_ptr)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type strsize;
|
|
|
|
|
|
|
|
|
|
strsize = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_HASH, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_STRTAB, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_SYMTAB, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_STRSZ, strsize)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_SYMENT,
|
|
|
|
|
bed->s->sizeof_sym))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The backend must work out the sizes of all the other dynamic
|
|
|
|
|
sections. */
|
|
|
|
|
if (bed->elf_backend_size_dynamic_sections
|
|
|
|
|
&& ! (*bed->elf_backend_size_dynamic_sections) (output_bfd, info))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (elf_hash_table (info)->dynamic_sections_created)
|
|
|
|
|
{
|
|
|
|
|
bfd_size_type dynsymcount;
|
|
|
|
|
asection *s;
|
|
|
|
|
size_t bucketcount = 0;
|
|
|
|
|
size_t hash_entry_size;
|
|
|
|
|
unsigned int dtagcount;
|
|
|
|
|
|
|
|
|
|
/* Set up the version definition section. */
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".gnu.version_d");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
|
|
|
|
|
/* We may have created additional version definitions if we are
|
|
|
|
|
just linking a regular application. */
|
|
|
|
|
verdefs = asvinfo.verdefs;
|
|
|
|
|
|
|
|
|
|
/* Skip anonymous version tag. */
|
|
|
|
|
if (verdefs != NULL && verdefs->vernum == 0)
|
|
|
|
|
verdefs = verdefs->next;
|
|
|
|
|
|
|
|
|
|
if (verdefs == NULL)
|
|
|
|
|
_bfd_strip_section_from_output (info, s);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned int cdefs;
|
|
|
|
|
bfd_size_type size;
|
|
|
|
|
struct bfd_elf_version_tree *t;
|
|
|
|
|
bfd_byte *p;
|
|
|
|
|
Elf_Internal_Verdef def;
|
|
|
|
|
Elf_Internal_Verdaux defaux;
|
|
|
|
|
|
|
|
|
|
cdefs = 0;
|
|
|
|
|
size = 0;
|
|
|
|
|
|
|
|
|
|
/* Make space for the base version. */
|
|
|
|
|
size += sizeof (Elf_External_Verdef);
|
|
|
|
|
size += sizeof (Elf_External_Verdaux);
|
|
|
|
|
++cdefs;
|
|
|
|
|
|
|
|
|
|
for (t = verdefs; t != NULL; t = t->next)
|
|
|
|
|
{
|
|
|
|
|
struct bfd_elf_version_deps *n;
|
|
|
|
|
|
|
|
|
|
size += sizeof (Elf_External_Verdef);
|
|
|
|
|
size += sizeof (Elf_External_Verdaux);
|
|
|
|
|
++cdefs;
|
|
|
|
|
|
|
|
|
|
for (n = t->deps; n != NULL; n = n->next)
|
|
|
|
|
size += sizeof (Elf_External_Verdaux);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s->_raw_size = size;
|
|
|
|
|
s->contents = bfd_alloc (output_bfd, s->_raw_size);
|
|
|
|
|
if (s->contents == NULL && s->_raw_size != 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
/* Fill in the version definition section. */
|
|
|
|
|
|
|
|
|
|
p = s->contents;
|
|
|
|
|
|
|
|
|
|
def.vd_version = VER_DEF_CURRENT;
|
|
|
|
|
def.vd_flags = VER_FLG_BASE;
|
|
|
|
|
def.vd_ndx = 1;
|
|
|
|
|
def.vd_cnt = 1;
|
|
|
|
|
def.vd_aux = sizeof (Elf_External_Verdef);
|
|
|
|
|
def.vd_next = (sizeof (Elf_External_Verdef)
|
|
|
|
|
+ sizeof (Elf_External_Verdaux));
|
|
|
|
|
|
|
|
|
|
if (soname_indx != (bfd_size_type) -1)
|
|
|
|
|
{
|
|
|
|
|
_bfd_elf_strtab_addref (elf_hash_table (info)->dynstr,
|
|
|
|
|
soname_indx);
|
|
|
|
|
def.vd_hash = bfd_elf_hash (soname);
|
|
|
|
|
defaux.vda_name = soname_indx;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
bfd_size_type indx;
|
|
|
|
|
|
|
|
|
|
name = basename (output_bfd->filename);
|
|
|
|
|
def.vd_hash = bfd_elf_hash (name);
|
|
|
|
|
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
|
|
|
|
|
name, FALSE);
|
|
|
|
|
if (indx == (bfd_size_type) -1)
|
|
|
|
|
return FALSE;
|
|
|
|
|
defaux.vda_name = indx;
|
|
|
|
|
}
|
|
|
|
|
defaux.vda_next = 0;
|
|
|
|
|
|
|
|
|
|
_bfd_elf_swap_verdef_out (output_bfd, &def,
|
|
|
|
|
(Elf_External_Verdef *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verdef);
|
|
|
|
|
_bfd_elf_swap_verdaux_out (output_bfd, &defaux,
|
|
|
|
|
(Elf_External_Verdaux *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verdaux);
|
|
|
|
|
|
|
|
|
|
for (t = verdefs; t != NULL; t = t->next)
|
|
|
|
|
{
|
|
|
|
|
unsigned int cdeps;
|
|
|
|
|
struct bfd_elf_version_deps *n;
|
|
|
|
|
struct elf_link_hash_entry *h;
|
|
|
|
|
struct bfd_link_hash_entry *bh;
|
|
|
|
|
|
|
|
|
|
cdeps = 0;
|
|
|
|
|
for (n = t->deps; n != NULL; n = n->next)
|
|
|
|
|
++cdeps;
|
|
|
|
|
|
|
|
|
|
/* Add a symbol representing this version. */
|
|
|
|
|
bh = NULL;
|
|
|
|
|
if (! (_bfd_generic_link_add_one_symbol
|
|
|
|
|
(info, dynobj, t->name, BSF_GLOBAL, bfd_abs_section_ptr,
|
|
|
|
|
0, NULL, FALSE,
|
|
|
|
|
get_elf_backend_data (dynobj)->collect, &bh)))
|
|
|
|
|
return FALSE;
|
|
|
|
|
h = (struct elf_link_hash_entry *) bh;
|
|
|
|
|
h->elf_link_hash_flags &= ~ ELF_LINK_NON_ELF;
|
|
|
|
|
h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
|
|
|
|
|
h->type = STT_OBJECT;
|
|
|
|
|
h->verinfo.vertree = t;
|
|
|
|
|
|
|
|
|
|
if (! _bfd_elf_link_record_dynamic_symbol (info, h))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
def.vd_version = VER_DEF_CURRENT;
|
|
|
|
|
def.vd_flags = 0;
|
|
|
|
|
if (t->globals.list == NULL
|
|
|
|
|
&& t->locals.list == NULL
|
|
|
|
|
&& ! t->used)
|
|
|
|
|
def.vd_flags |= VER_FLG_WEAK;
|
|
|
|
|
def.vd_ndx = t->vernum + 1;
|
|
|
|
|
def.vd_cnt = cdeps + 1;
|
|
|
|
|
def.vd_hash = bfd_elf_hash (t->name);
|
|
|
|
|
def.vd_aux = sizeof (Elf_External_Verdef);
|
|
|
|
|
def.vd_next = 0;
|
|
|
|
|
if (t->next != NULL)
|
|
|
|
|
def.vd_next = (sizeof (Elf_External_Verdef)
|
|
|
|
|
+ (cdeps + 1) * sizeof (Elf_External_Verdaux));
|
|
|
|
|
|
|
|
|
|
_bfd_elf_swap_verdef_out (output_bfd, &def,
|
|
|
|
|
(Elf_External_Verdef *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verdef);
|
|
|
|
|
|
|
|
|
|
defaux.vda_name = h->dynstr_index;
|
|
|
|
|
_bfd_elf_strtab_addref (elf_hash_table (info)->dynstr,
|
|
|
|
|
h->dynstr_index);
|
|
|
|
|
defaux.vda_next = 0;
|
|
|
|
|
if (t->deps != NULL)
|
|
|
|
|
defaux.vda_next = sizeof (Elf_External_Verdaux);
|
|
|
|
|
t->name_indx = defaux.vda_name;
|
|
|
|
|
|
|
|
|
|
_bfd_elf_swap_verdaux_out (output_bfd, &defaux,
|
|
|
|
|
(Elf_External_Verdaux *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verdaux);
|
|
|
|
|
|
|
|
|
|
for (n = t->deps; n != NULL; n = n->next)
|
|
|
|
|
{
|
|
|
|
|
if (n->version_needed == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* This can happen if there was an error in the
|
|
|
|
|
version script. */
|
|
|
|
|
defaux.vda_name = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
defaux.vda_name = n->version_needed->name_indx;
|
|
|
|
|
_bfd_elf_strtab_addref (elf_hash_table (info)->dynstr,
|
|
|
|
|
defaux.vda_name);
|
|
|
|
|
}
|
|
|
|
|
if (n->next == NULL)
|
|
|
|
|
defaux.vda_next = 0;
|
|
|
|
|
else
|
|
|
|
|
defaux.vda_next = sizeof (Elf_External_Verdaux);
|
|
|
|
|
|
|
|
|
|
_bfd_elf_swap_verdaux_out (output_bfd, &defaux,
|
|
|
|
|
(Elf_External_Verdaux *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verdaux);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_VERDEF, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_VERDEFNUM, cdefs))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
elf_tdata (output_bfd)->cverdefs = cdefs;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((info->new_dtags && info->flags) || (info->flags & DF_STATIC_TLS))
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_FLAGS, info->flags))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
else if (info->flags & DF_BIND_NOW)
|
|
|
|
|
{
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_BIND_NOW, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (info->flags_1)
|
|
|
|
|
{
|
|
|
|
|
if (info->executable)
|
|
|
|
|
info->flags_1 &= ~ (DF_1_INITFIRST
|
|
|
|
|
| DF_1_NODELETE
|
|
|
|
|
| DF_1_NOOPEN);
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_FLAGS_1, info->flags_1))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Work out the size of the version reference section. */
|
|
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".gnu.version_r");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
{
|
|
|
|
|
struct elf_find_verdep_info sinfo;
|
|
|
|
|
|
|
|
|
|
sinfo.output_bfd = output_bfd;
|
|
|
|
|
sinfo.info = info;
|
|
|
|
|
sinfo.vers = elf_tdata (output_bfd)->cverdefs;
|
|
|
|
|
if (sinfo.vers == 0)
|
|
|
|
|
sinfo.vers = 1;
|
|
|
|
|
sinfo.failed = FALSE;
|
|
|
|
|
|
|
|
|
|
elf_link_hash_traverse (elf_hash_table (info),
|
|
|
|
|
_bfd_elf_link_find_version_dependencies,
|
|
|
|
|
&sinfo);
|
|
|
|
|
|
|
|
|
|
if (elf_tdata (output_bfd)->verref == NULL)
|
|
|
|
|
_bfd_strip_section_from_output (info, s);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Verneed *t;
|
|
|
|
|
unsigned int size;
|
|
|
|
|
unsigned int crefs;
|
|
|
|
|
bfd_byte *p;
|
|
|
|
|
|
|
|
|
|
/* Build the version definition section. */
|
|
|
|
|
size = 0;
|
|
|
|
|
crefs = 0;
|
|
|
|
|
for (t = elf_tdata (output_bfd)->verref;
|
|
|
|
|
t != NULL;
|
|
|
|
|
t = t->vn_nextref)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Vernaux *a;
|
|
|
|
|
|
|
|
|
|
size += sizeof (Elf_External_Verneed);
|
|
|
|
|
++crefs;
|
|
|
|
|
for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
|
|
|
|
|
size += sizeof (Elf_External_Vernaux);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s->_raw_size = size;
|
|
|
|
|
s->contents = bfd_alloc (output_bfd, s->_raw_size);
|
|
|
|
|
if (s->contents == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
p = s->contents;
|
|
|
|
|
for (t = elf_tdata (output_bfd)->verref;
|
|
|
|
|
t != NULL;
|
|
|
|
|
t = t->vn_nextref)
|
|
|
|
|
{
|
|
|
|
|
unsigned int caux;
|
|
|
|
|
Elf_Internal_Vernaux *a;
|
|
|
|
|
bfd_size_type indx;
|
|
|
|
|
|
|
|
|
|
caux = 0;
|
|
|
|
|
for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
|
|
|
|
|
++caux;
|
|
|
|
|
|
|
|
|
|
t->vn_version = VER_NEED_CURRENT;
|
|
|
|
|
t->vn_cnt = caux;
|
|
|
|
|
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
|
|
|
|
|
elf_dt_name (t->vn_bfd) != NULL
|
|
|
|
|
? elf_dt_name (t->vn_bfd)
|
|
|
|
|
: basename (t->vn_bfd->filename),
|
|
|
|
|
FALSE);
|
|
|
|
|
if (indx == (bfd_size_type) -1)
|
|
|
|
|
return FALSE;
|
|
|
|
|
t->vn_file = indx;
|
|
|
|
|
t->vn_aux = sizeof (Elf_External_Verneed);
|
|
|
|
|
if (t->vn_nextref == NULL)
|
|
|
|
|
t->vn_next = 0;
|
|
|
|
|
else
|
|
|
|
|
t->vn_next = (sizeof (Elf_External_Verneed)
|
|
|
|
|
+ caux * sizeof (Elf_External_Vernaux));
|
|
|
|
|
|
|
|
|
|
_bfd_elf_swap_verneed_out (output_bfd, t,
|
|
|
|
|
(Elf_External_Verneed *) p);
|
|
|
|
|
p += sizeof (Elf_External_Verneed);
|
|
|
|
|
|
|
|
|
|
for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
|
|
|
|
|
{
|
|
|
|
|
a->vna_hash = bfd_elf_hash (a->vna_nodename);
|
|
|
|
|
indx = _bfd_elf_strtab_add (elf_hash_table (info)->dynstr,
|
|
|
|
|
a->vna_nodename, FALSE);
|
|
|
|
|
if (indx == (bfd_size_type) -1)
|
|
|
|
|
return FALSE;
|
|
|
|
|
a->vna_name = indx;
|
|
|
|
|
if (a->vna_nextptr == NULL)
|
|
|
|
|
a->vna_next = 0;
|
|
|
|
|
else
|
|
|
|
|
a->vna_next = sizeof (Elf_External_Vernaux);
|
|
|
|
|
|
|
|
|
|
_bfd_elf_swap_vernaux_out (output_bfd, a,
|
|
|
|
|
(Elf_External_Vernaux *) p);
|
|
|
|
|
p += sizeof (Elf_External_Vernaux);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_VERNEED, 0)
|
|
|
|
|
|| !_bfd_elf_add_dynamic_entry (info, DT_VERNEEDNUM, crefs))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
elf_tdata (output_bfd)->cverrefs = crefs;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Assign dynsym indicies. In a shared library we generate a
|
|
|
|
|
section symbol for each output section, which come first.
|
|
|
|
|
Next come all of the back-end allocated local dynamic syms,
|
|
|
|
|
followed by the rest of the global symbols. */
|
|
|
|
|
|
|
|
|
|
dynsymcount = _bfd_elf_link_renumber_dynsyms (output_bfd, info);
|
|
|
|
|
|
|
|
|
|
/* Work out the size of the symbol version section. */
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".gnu.version");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
if (dynsymcount == 0
|
|
|
|
|
|| (verdefs == NULL && elf_tdata (output_bfd)->verref == NULL))
|
|
|
|
|
{
|
|
|
|
|
_bfd_strip_section_from_output (info, s);
|
|
|
|
|
/* The DYNSYMCOUNT might have changed if we were going to
|
|
|
|
|
output a dynamic symbol table entry for S. */
|
|
|
|
|
dynsymcount = _bfd_elf_link_renumber_dynsyms (output_bfd, info);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
s->_raw_size = dynsymcount * sizeof (Elf_External_Versym);
|
|
|
|
|
s->contents = bfd_zalloc (output_bfd, s->_raw_size);
|
|
|
|
|
if (s->contents == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_VERSYM, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the size of the .dynsym and .hash sections. We counted
|
|
|
|
|
the number of dynamic symbols in elf_link_add_object_symbols.
|
|
|
|
|
We will build the contents of .dynsym and .hash when we build
|
|
|
|
|
the final symbol table, because until then we do not know the
|
|
|
|
|
correct value to give the symbols. We built the .dynstr
|
|
|
|
|
section as we went along in elf_link_add_object_symbols. */
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".dynsym");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
s->_raw_size = dynsymcount * bed->s->sizeof_sym;
|
|
|
|
|
s->contents = bfd_alloc (output_bfd, s->_raw_size);
|
|
|
|
|
if (s->contents == NULL && s->_raw_size != 0)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (dynsymcount != 0)
|
|
|
|
|
{
|
|
|
|
|
Elf_Internal_Sym isym;
|
|
|
|
|
|
|
|
|
|
/* The first entry in .dynsym is a dummy symbol. */
|
|
|
|
|
isym.st_value = 0;
|
|
|
|
|
isym.st_size = 0;
|
|
|
|
|
isym.st_name = 0;
|
|
|
|
|
isym.st_info = 0;
|
|
|
|
|
isym.st_other = 0;
|
|
|
|
|
isym.st_shndx = 0;
|
|
|
|
|
bed->s->swap_symbol_out (output_bfd, &isym, s->contents, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Compute the size of the hashing table. As a side effect this
|
|
|
|
|
computes the hash values for all the names we export. */
|
|
|
|
|
bucketcount = compute_bucket_count (info);
|
|
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".hash");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
hash_entry_size = elf_section_data (s)->this_hdr.sh_entsize;
|
|
|
|
|
s->_raw_size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
|
|
|
|
|
s->contents = bfd_zalloc (output_bfd, s->_raw_size);
|
|
|
|
|
if (s->contents == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
bfd_put (8 * hash_entry_size, output_bfd, bucketcount, s->contents);
|
|
|
|
|
bfd_put (8 * hash_entry_size, output_bfd, dynsymcount,
|
|
|
|
|
s->contents + hash_entry_size);
|
|
|
|
|
|
|
|
|
|
elf_hash_table (info)->bucketcount = bucketcount;
|
|
|
|
|
|
|
|
|
|
s = bfd_get_section_by_name (dynobj, ".dynstr");
|
|
|
|
|
BFD_ASSERT (s != NULL);
|
|
|
|
|
|
2004-03-26 13:55:15 +08:00
|
|
|
|
elf_finalize_dynstr (output_bfd, info);
|
2004-03-25 20:48:45 +08:00
|
|
|
|
|
|
|
|
|
s->_raw_size = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
|
|
|
|
|
|
|
|
|
|
for (dtagcount = 0; dtagcount <= info->spare_dynamic_tags; ++dtagcount)
|
|
|
|
|
if (!_bfd_elf_add_dynamic_entry (info, DT_NULL, 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|