diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-06-04 09:56:25 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-06-04 09:56:25 -0700 |
| commit | add5f777decf9257f46c98dc2aacedb52a3d65e6 (patch) | |
| tree | 620e7fe6c7154e862559c5609f9d432f47a38e83 | |
| parent | 1c07a73f66382eb0c95132aaf9690621fdce1e78 (diff) | |
| download | gdb-add5f777decf9257f46c98dc2aacedb52a3d65e6.zip gdb-add5f777decf9257f46c98dc2aacedb52a3d65e6.tar.gz gdb-add5f777decf9257f46c98dc2aacedb52a3d65e6.tar.bz2 | |
x86: Remove target_id from elf_x86_link_hash_table
Since target_id in elf_x86_link_hash_table is the same as hash_table_id
in elf_link_hash_table, we can use elf.hash_table_id instead of target_id.
* elfxx-x86.h (elf_x86_link_hash_table): Remove target_id.
(is_x86_elf): Check elf.hash_table_id instead of target_id.
* elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Updated.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elfxx-x86.c | 1 | ||||
| -rw-r--r-- | bfd/elfxx-x86.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 13a3ed1..fb87353 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2020-06-04 H.J. Lu <hongjiu.lu@intel.com> + * elfxx-x86.h (elf_x86_link_hash_table): Remove target_id. + (is_x86_elf): Check elf.hash_table_id instead of target_id. + * elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Updated. + +2020-06-04 H.J. Lu <hongjiu.lu@intel.com> + PR ld/26080 * elf-m10300.c (mn10300_elf_relocate_section): Resolve relocation in debug section against symbol defined in shared library to 0. diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 035b5c5..d796292 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -762,7 +762,6 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd) ret->tls_get_addr = "___tls_get_addr"; } } - ret->target_id = bed->target_id; ret->target_os = get_elf_x86_backend_data (abfd)->target_os; ret->loc_hash_table = htab_try_create (1024, diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index c717cd1..de4e78f 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -531,7 +531,6 @@ struct elf_x86_link_hash_table bfd_vma (*r_info) (bfd_vma, bfd_vma); bfd_vma (*r_sym) (bfd_vma); bfd_boolean (*is_reloc_section) (const char *); - enum elf_target_id target_id; enum elf_x86_target_os target_os; unsigned int sizeof_reloc; unsigned int dt_reloc; @@ -629,7 +628,7 @@ struct elf_x86_plt #define is_x86_elf(bfd, htab) \ (bfd_get_flavour (bfd) == bfd_target_elf_flavour \ && elf_tdata (bfd) != NULL \ - && elf_object_id (bfd) == (htab)->target_id) + && elf_object_id (bfd) == (htab)->elf.hash_table_id) extern bfd_boolean _bfd_x86_elf_mkobject (bfd *); |