diff options
| author | Jim Wilson <jimw@sifive.com> | 2020-01-27 15:19:30 -0800 |
|---|---|---|
| committer | Jim Wilson <jimw@sifive.com> | 2020-01-27 15:19:30 -0800 |
| commit | c35d018b1a5ec604e49a807402c4205530b25ca8 (patch) | |
| tree | d55f33fe9503ba419b8fbe5f8a64a20f87d28280 | |
| parent | 16b10d6e61bfa0940333354e8144b3924dc86e56 (diff) | |
| download | binutils-c35d018b1a5ec604e49a807402c4205530b25ca8.zip binutils-c35d018b1a5ec604e49a807402c4205530b25ca8.tar.gz binutils-c35d018b1a5ec604e49a807402c4205530b25ca8.tar.bz2 | |
RISC-V: Fix gdbserver problem with handling arch strings.
Maciej reported a problem found by his RISC-V gdbserver port.
warning: while parsing target description (at line 4): Target description specified unknown architecture "riscv:rv64id"
warning: Could not load XML target description; ignoring
We only have two arches defined, riscv:rv32 and riscv:rv64. Both bfd and
gdb are creating arch strings that have extension letters added to the base
architecture. The bfd_default_scan function requires an exact match, so
these strings fail to map to a bfd_arch. I think we should ignore the
extension letters in a RISC-V specific scan function.
bfd/
* cpu-riscv.c (riscv_scan): New.
(N): Change bfd_default_scan to riscv_scan.
Change-Id: I096476705e1da5cb8934c5005b1eed2a8989f7a7
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/cpu-riscv.c | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index afa8928..83a1cc6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2020-01-27 Jim Wilson <jimw@sifive.com> + + * cpu-riscv.c (riscv_scan): New. + (N): Change bfd_default_scan to riscv_scan. + 2020-01-27 Andreas Schwab <schwab@suse.de> * Makefile.am (ALL_MACHINES): Remove cpu-plugin.lo. diff --git a/bfd/cpu-riscv.c b/bfd/cpu-riscv.c index bc90ffc..b5c972f 100644 --- a/bfd/cpu-riscv.c +++ b/bfd/cpu-riscv.c @@ -39,6 +39,23 @@ riscv_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b) return a; } +/* Return TRUE if STRING matches the architecture described by INFO. */ + +static bfd_boolean +riscv_scan (const struct bfd_arch_info *info, const char *string) +{ + if (bfd_default_scan (info, string)) + return TRUE; + + /* The string might have extra characters for supported subsets. So allow + a match that ignores trailing characters in string. */ + if (strncasecmp (string, info->printable_name, + strlen (info->printable_name)) == 0) + return TRUE; + + return FALSE; +} + #define N(BITS, NUMBER, PRINT, DEFAULT, NEXT) \ { \ BITS, /* Bits in a word. */ \ @@ -51,7 +68,7 @@ riscv_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b) 3, \ DEFAULT, \ riscv_compatible, \ - bfd_default_scan, \ + riscv_scan, \ bfd_arch_default_fill, \ NEXT, \ 0 /* Maximum offset of a reloc from the start of an insn. */\ |