[binutils-gdb/binutils-2_29-branch] frv-elf --gc-sections failures

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a60fff76279225bcb2eeaeb9f89b02bba8d3a126

commit a60fff76279225bcb2eeaeb9f89b02bba8d3a126
Author: Alan Modra <amodra@gmail.com>
Date:   Mon Oct 30 12:02:42 2017 +1030

    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.

Diff:
---
 bfd/ChangeLog   | 4 ++++
 bfd/elf32-frv.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a86ad61..97c4b1d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -2,6 +2,10 @@
 
 	Apply from master
 	2017-10-30  Alan Modra  <amodra@gmail.com>
+	* elf32-frv.c (ELF_TARGET_ID): Don't define for generic
+	elf target.
+
+	2017-10-30  Alan Modra  <amodra@gmail.com>
 	* 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 ef609ff..67b3c6a 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
 
@@ -6812,6 +6811,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