From e8d4709e6a5f4e3fad8479b8069c52294be54488 Mon Sep 17 00:00:00 2001 From: Nelson Chu Date: Sat, 21 Nov 2020 11:19:58 +0800 Subject: RISC-V: Don't allow any uppercase letter in the arch string. Although I cannot find any RISC-V specs said that uppercases are not allowed in the arhc string, but seems like it is an established fact both for GNU and LLVM. Therefore, we shouldn't allow the uppercases for the non-standard x extensions, too. bfd/ * elfxx-riscv.c (riscv_parse_subset): ISA string cannot contain any uppercase letter. gas/ * testsuite/gas/riscv/march-fail-uppercase-base.d: Updated. * testsuite/gas/riscv/march-fail-uppercase.l: Updated. * testsuite/gas/riscv/march-fail-uppercase-x.d: New testcase. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-riscv.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4c6c694..3ac2719 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2020-12-01 Nelson Chu + * elfxx-riscv.c (riscv_parse_subset): ISA string cannot contain + any uppercase letter. + +2020-12-01 Nelson Chu + * elfxx-riscv.c: Re-indent codes, unify and improve the error messages and comments. (riscv_parse_prefixed_ext): Stop parsing the prefixed class diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 5ed8aa0..69f3a43 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1510,9 +1510,21 @@ bfd_boolean riscv_parse_subset (riscv_parse_subset_t *rps, const char *arch) { - const char *p = arch; + const char *p; size_t i; + for (p = arch; *p != '\0'; p++) + { + if (ISUPPER (*p)) + { + rps->error_handler + (_("-march=%s: ISA string cannot contain uppercase letters"), + arch); + return FALSE; + } + } + + p = arch; if (strncmp (p, "rv32", 4) == 0) { *rps->xlen = 32; -- cgit v1.1