From 7f9cb5d275e71a75e97230241ec7da6718a7a0f5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 30 Oct 2017 12:02:42 +1030 Subject: [PATCH] frv-elf --gc-sections failures git commit 81742b83e9 exposed an frv-elf bug, with the object id not matching the hash table id. * elf32-frv.c (ELF_TARGET_ID): Don't define for generic elf target. --- bfd/ChangeLog | 3 +++ bfd/elf32-frv.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7cf5b3270c0..d6de8d59b0f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,8 @@ 2017-10-30 Alan Modra + * elf32-frv.c (ELF_TARGET_ID): Don't define for generic + elf target. + * elflink.c (elf_gc_sweep): Test elf_object_id in addition to relocs_compatible. (bfd_elf_gc_sections): Likewise. diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index 7eb003e3633..825b9a06691 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -6773,7 +6773,6 @@ elf32_frv_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) return TRUE; } #define ELF_ARCH bfd_arch_frv -#define ELF_TARGET_ID FRV_ELF_DATA #define ELF_MACHINE_CODE EM_CYGNUS_FRV #define ELF_MAXPAGESIZE 0x1000 @@ -6814,6 +6813,8 @@ elf32_frv_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) #include "elf32-target.h" +#undef ELF_TARGET_ID +#define ELF_TARGET_ID FRV_ELF_DATA #undef ELF_MAXPAGESIZE #define ELF_MAXPAGESIZE 0x4000 -- 2.30.2