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  <amodra@gmail.com>
 
+	* 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