2076-01-31 H.J. Lu <hongjiu.lu@intel.com>

	* elf32-cris.c (INCLUDED_TARGET_FILE): Removed.
	(elf32_bed): Defined for elf32-us-cris.

	* elf64-sh64.c (elf64_bed): Defined for Linux.
	(INCLUDED_TARGET_FILE): Removed.

	* elfxx-target.h (elfNN_bed): Always define. Don't check
	INCLUDED_TARGET_FILE.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 44bc9e07c2e6f04565f7f5adc2700e08a4d7c60d..bd3d38d9e0f9d4f5e34da60e68d3b3add10dae45 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2076-01-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf32-cris.c (INCLUDED_TARGET_FILE): Removed.
+       (elf32_bed): Defined for elf32-us-cris.
+
+       * elf64-sh64.c (elf64_bed): Defined for Linux.
+       (INCLUDED_TARGET_FILE): Removed.
+
+       * elfxx-target.h (elfNN_bed): Always define. Don't check
+       INCLUDED_TARGET_FILE.
+
 2007-01-31  DJ Delorie  <dj@redhat.com>
 
        * elf-m10300.c (mn10300_elf_relocate_section): Clarify the warning

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 199ee1b4bffad10799f35a4d42c6d9c6a52d35fc..6966a78ab6af8797c0d95066b3cba61fccef6bcc 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -3428,8 +3428,6 @@ elf_cris_reloc_type_class (rela)
 
 #include "elf32-target.h"
 
-#define INCLUDED_TARGET_FILE
-
 #undef TARGET_LITTLE_SYM
 #undef TARGET_LITTLE_NAME
 #undef elf_symbol_leading_char
@@ -3437,5 +3435,7 @@ elf_cris_reloc_type_class (rela)
 #define TARGET_LITTLE_SYM bfd_elf32_us_cris_vec
 #define TARGET_LITTLE_NAME "elf32-us-cris"
 #define elf_symbol_leading_char '_'
+#undef elf32_bed
+#define elf32_bed elf32_us_cris_bed
 
 #include "elf32-target.h"

diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 731995f2b832e1d0c1a9f9a9aceac680081207b3..18fa063d0a0cd863fd800a63b4cf4d9877afcb78 100644 (file)
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -4136,6 +4136,7 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
 #define        TARGET_LITTLE_SYM               bfd_elf64_sh64lin_vec
 #undef TARGET_LITTLE_NAME
 #define        TARGET_LITTLE_NAME              "elf64-sh64-linux"
+#undef elf64_bed
+#define        elf64_bed                       elf64_sh64_linux_bed
 
-#define        INCLUDED_TARGET_FILE
 #include "elf64-target.h"

diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h
index 306f3efcc27e0697522afa12f52d1ea5ee0dacae..f51617c79ef4c31057bb82cecfca2dc1faeb9818 100644 (file)
--- a/bfd/elfxx-target.h
+++ b/bfd/elfxx-target.h
@@ -576,7 +576,6 @@
 
 extern const struct elf_size_info _bfd_elfNN_size_info;
 
-#ifndef INCLUDED_TARGET_FILE
 static struct elf_backend_data elfNN_bed =
 {
   ELF_ARCH,                    /* arch */
@@ -682,7 +681,6 @@ static struct elf_backend_data elfNN_bed =
   elf_backend_want_dynbss,
   elf_backend_want_p_paddr_set_to_zero
 };
-#endif
 
 /* Forward declaration for use when initialising alternative_target field.  */
 #ifdef TARGET_LITTLE_SYM