From 3f9f055402fb5b15b0b74f6d5cde85954bd59580 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Thu, 4 Nov 2004 14:58:13 +0000 Subject: * config.bfd: Support crisv32-*-* like cris-*-*. * archures.c (bfd_mach_cris_v0_v10, bfd_mach_cris_v32) (bfd_mach_cris_v10_v32): New macros. * cpu-cris.c: Tweak formatting. (get_compatible): New function. (N): New macro. (bfd_cris_arch_compat_v10_v32, bfd_cris_arch_v32): New bfd_arch_info_type:s. (bfd_cris_arch): Use bfd_mach_cris_v0_v10 for member mach, get_compatible for member compatible and link bfd_cris_arch_v32 as next. * elf32-cris.c (cris_elf_pcrel_reloc) (cris_elf_set_mach_from_flags): New functions. (cris_elf_howto_table) : Use cris_elf_pcrel_reloc. (cris_elf_grok_prstatus, cris_elf_grok_psinfo): Give correct numbers for bfd_mach_cris_v32. (PLT_ENTRY_SIZE_V32): New macro. (elf_cris_plt0_entry): Drop last comma in initializer. (elf_cris_plt0_entry_v32, elf_cris_plt_entry_v32) (elf_cris_pic_plt0_entry_v32, elf_cris_pic_plt_entry_v32): New PLT initializers. (cris_elf_relocate_section): Change all "%B(%A)" messages to "%B, section %A". (elf_cris_finish_dynamic_symbol): Do V32-specific PLT entries. (elf_cris_finish_dynamic_sections): Similar. (elf_cris_adjust_dynamic_symbol): Similar. (cris_elf_check_relocs): Change all "%B(%A)" messages to "%B, section %A". : Emit error and return FALSE for bfd_mach_cris_v10_v32. : Emit warning when generating textrel reloc. (cris_elf_object_p): Call cris_elf_set_mach_from_flags. (cris_elf_final_write_processing): Set flags according to mach. (cris_elf_print_private_bfd_data): Display EF_CRIS_VARIANT_COMMON_V10_V32 and EF_CRIS_VARIANT_V32. (cris_elf_merge_private_bfd_data): Drop variables old_flags, new_flags. Don't call cris_elf_final_write_processing. Don't look at the actual elf header flags at all; use bfd_get_symbol_leading_char to check ibfd, obfd. Trap difference in bfd_get_mach for ibfd and obfd and handle merging of compatible objects. (bfd_elf32_bfd_copy_private_bfd_data): Define. * reloc.c (BFD_RELOC_CRIS_SIGNED_8, BFD_RELOC_CRIS_UNSIGNED_8) (BFD_RELOC_CRIS_SIGNED_16, BFD_RELOC_CRIS_UNSIGNED_16) (BFD_RELOC_CRIS_LAPCQ_OFFSET): New relocs. * bfd-in2.h, libbfd.h: Regenerate. --- bfd/cpu-cris.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 8 deletions(-) (limited to 'bfd/cpu-cris.c') diff --git a/bfd/cpu-cris.c b/bfd/cpu-cris.c index 9e60ff062f3..d15a2756aa8 100644 --- a/bfd/cpu-cris.c +++ b/bfd/cpu-cris.c @@ -23,8 +23,58 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" -const bfd_arch_info_type -bfd_cris_arch = +/* This routine is provided two arch_infos and returns the lowest common + denominator. CRIS v0..v10 vs. v32 are not compatible in general, but + there's a compatible subset for which we provide an arch_info. */ + +static const bfd_arch_info_type * get_compatible + PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *)); + +static const bfd_arch_info_type * +get_compatible (a,b) + const bfd_arch_info_type *a; + const bfd_arch_info_type *b; +{ + /* Arches must match. */ + if (a->arch != b->arch) + return NULL; + + /* If either is the compatible mach, return the other. */ + if (a->mach == bfd_mach_cris_v10_v32) + return b; + if (b->mach == bfd_mach_cris_v10_v32) + return a; + +#if 0 + /* See ldlang.c:lang_check. Quite illogically, incompatible arches + (as signalled by this function) are only *warned* about, while with + this function signalling compatible ones, we can have the + cris_elf_merge_private_bfd_data function return an error. This is + undoubtedly a FIXME: in general. Also, the + command_line.warn_mismatch flag and the --no-warn-mismatch option + are misnamed for the multitude of ports that signal compatibility: + it is there an error, not a warning. We work around it by + pretending matching machs here. */ + + /* Except for the compatible mach, machs must match. */ + if (a->mach != b->mach) + return NULL; +#endif + + return a; +} + +#define N(NUMBER, PRINT, NEXT) \ + { 32, 32, 8, bfd_arch_cris, NUMBER, "cris", PRINT, 1, FALSE, \ + get_compatible, bfd_default_scan, NEXT } + +static const bfd_arch_info_type bfd_cris_arch_compat_v10_v32 = + N (bfd_mach_cris_v10_v32, "cris:common_v10_v32", NULL); + +static const bfd_arch_info_type bfd_cris_arch_v32 = + N (bfd_mach_cris_v32, "crisv32", &bfd_cris_arch_compat_v10_v32); + +const bfd_arch_info_type bfd_cris_arch = { 32, /* There's 32 bits_per_word. */ 32, /* There's 32 bits_per_address. */ @@ -32,20 +82,20 @@ bfd_cris_arch = bfd_arch_cris, /* One of enum bfd_architecture, defined in archures.c and provided in generated header files. */ - 0xff, /* Only 1 machine, but #255 for - historical reasons. */ + bfd_mach_cris_v0_v10, /* Random BFD-internal number for this + machine, similarly listed in + archures.c. Not emitted in output. */ "cris", /* The arch_name. */ "cris", /* The printable name is the same. */ 1, /* Section alignment power; each section is aligned to (only) 2^1 bytes. */ - TRUE, /* This is the default "machine", since - there's only one. */ - bfd_default_compatible, /* A default function for testing + TRUE, /* This is the default "machine". */ + get_compatible, /* A function for testing "machine" compatibility of two bfd_arch_info_type. */ bfd_default_scan, /* Check if a bfd_arch_info_type is a match. */ - NULL /* Pointer to next bfd_arch_info_type in + &bfd_cris_arch_v32 /* Pointer to next bfd_arch_info_type in the same family. */ }; -- cgit v1.2.1