From: Alan Modra <amodra@gmail.com>
Date: Tue, 17 Dec 2024 03:59:57 +0000 (+1030)
Subject: Re: score and mmix target_id
X-Git-Tag: gdb-16-branchpoint~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a030e43267f37681961866760156d74b4e9e30d6;p=thirdparty%2Fbinutils-gdb.git

Re: score and mmix target_id

elflink.c checks elf_object_id(ibfd) == elf_hash_table_id(hash_table)
in a number of places.  Make them match.
---

diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index 03ea71d150e..76e8761cf90 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -4365,7 +4365,7 @@ elf32_score_link_hash_table_create (bfd *abfd)
 
   if (!_bfd_elf_link_hash_table_init (ret, abfd, score_elf_link_hash_newfunc,
 				      sizeof (struct score_elf_link_hash_entry),
-				      GENERIC_ELF_DATA))
+				      SCORE_ELF_DATA))
     {
       free (ret);
       return NULL;
diff --git a/bfd/elflink.c b/bfd/elflink.c
index ef159dafd55..2b9e8b9ea30 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -8354,7 +8354,7 @@ _bfd_elf_link_hash_table_create (bfd *abfd)
 
   if (! _bfd_elf_link_hash_table_init (ret, abfd, _bfd_elf_link_hash_newfunc,
 				       sizeof (struct elf_link_hash_entry),
-				       GENERIC_ELF_DATA))
+				       get_elf_backend_data (abfd)->target_id))
     {
       free (ret);
       return NULL;