From 16cecee58c89efff1da4d90daaccbc5861f74794 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 31 Jan 2007 14:28:03 +0000 Subject: [PATCH] 2076-01-31 H.J. Lu * 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. --- bfd/ChangeLog | 11 +++++++++++ bfd/elf32-cris.c | 4 ++-- bfd/elf64-sh64.c | 3 ++- bfd/elfxx-target.h | 2 -- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 44bc9e07c2e..bd3d38d9e0f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2076-01-31 H.J. Lu + + * 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 * elf-m10300.c (mn10300_elf_relocate_section): Clarify the warning diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 199ee1b4bff..6966a78ab6a 100644 --- 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 731995f2b83..18fa063d0a0 100644 --- 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 306f3efcc27..f51617c79ef 100644 --- 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 -- 2.30.2