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 03ea71d150e73ece262b06d2d353795c8100b727..76e8761cf9042bd9fb86f7dffb8bff2d2672408e 100644 (file)
--- 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 ef159dafd55f8ff31746fe8f0f023142f34ad119..2b9e8b9ea302855333f624de3879df7731ea0240 100644 (file)
--- 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;