From 1a7e622b82fa621ab505dd911bc30c1efcb4a9b0 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 21 Nov 2022 16:44:02 +0000 Subject: Fix ARM and AArch64 assembler tests to work in a multi-arch environment. PR 29764 gas * testsuite/gas/arm/cpu-cortex-a76ae.d: Add arm prefix to the -m option passed to objdump. * testsuite/gas/arm/cpu-cortex-a77.d: Likewise. * testsuite/gas/aarch64/cpu-cortex-a76ae.d: Add aarch64 prefix to the -m option passed to objdump. * testsuite/gas/aarch64/cpu-cortex-a77.d: Likewise. bfd * cpu-arm.c (scan): Accept machine names prefixed with "arm:". * cpu-aarch64.c (scan): Accept machine names prefixed with "aarch64:". bin * doc/binutils.texi (objdump): Note that the -m option supports the : syntax. --- bfd/cpu-arm.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bfd/cpu-arm.c') diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c index 853a118..6d77e12 100644 --- a/bfd/cpu-arm.c +++ b/bfd/cpu-arm.c @@ -210,6 +210,15 @@ scan (const struct bfd_arch_info *info, const char *string) if (strcasecmp (string, info->printable_name) == 0) return true; + /* If there is a prefix of "arm:" then skip it. */ + const char * colon; + if ((colon = strchr (string, ':')) != NULL) + { + if (strncasecmp (string, "arm", colon - string) != 0) + return false; + string = colon + 1; + } + /* Next check for a processor name instead of an Architecture name. */ for (i = sizeof (processors) / sizeof (processors[0]); i--;) { -- cgit v1.1