diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2023-09-01 13:52:49 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2023-09-04 12:34:30 +0000 |
| commit | b3a1e48614c3ae9a9be09e32183b9a57c93e1f88 (patch) | |
| tree | e09b0987fd1e36ed5f1d75af5a5a7580c65f32a5 /ld/testsuite | |
| parent | 1b9a9c30a073c9be8ae12faf195021e843ba9757 (diff) | |
| download | gdb-b3a1e48614c3ae9a9be09e32183b9a57c93e1f88.zip gdb-b3a1e48614c3ae9a9be09e32183b9a57c93e1f88.tar.gz gdb-b3a1e48614c3ae9a9be09e32183b9a57c93e1f88.tar.bz2 | |
arm: Make 'conflicting CPU architectures' error message more user-friendly
Error messages such as "conflicting CPU architectures 10/16" are not
very to understand, so this patch replaces the numbers with the
description they actually mean:
"conflicting CPU architectures ARM v7E-M vs Pre v4"
2023-09-01 Christophe Lyon <christophe.lyon@linaro.org>
bfd/
* elf32-arm.c (tag_cpu_arch_combine): Add name_table parameter and
use it.
(elf32_arm_merge_eabi_attributes): Update call to
tag_cpu_arch_combine.
ld/
* testsuite/ld-arm/attr-merge-9.out: Update expected error
message.
* testsuite/ld-arm/attr-merge-arch-2.d: Likewise.
Diffstat (limited to 'ld/testsuite')
| -rw-r--r-- | ld/testsuite/ld-arm/attr-merge-9.out | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-arm/attr-merge-arch-2.d | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ld/testsuite/ld-arm/attr-merge-9.out b/ld/testsuite/ld-arm/attr-merge-9.out index 6c3e5f3..552a80a 100644 --- a/ld/testsuite/ld-arm/attr-merge-9.out +++ b/ld/testsuite/ld-arm/attr-merge-9.out @@ -1,2 +1,2 @@ -.*: error: .*: conflicting CPU architectures 10/16 +.*: error: conflicting CPU architectures ARM v7 vs ARM v8-M.baseline in .* .*: failed to merge target specific data of file tmpdir/attr-merge-9b.o diff --git a/ld/testsuite/ld-arm/attr-merge-arch-2.d b/ld/testsuite/ld-arm/attr-merge-arch-2.d index f7de02c..cebea49 100644 --- a/ld/testsuite/ld-arm/attr-merge-arch-2.d +++ b/ld/testsuite/ld-arm/attr-merge-arch-2.d @@ -2,4 +2,4 @@ #source: attr-merge-arch-2b.s #as: #ld: -e main -#error: conflicting CPU architectures 13/0 +#error: conflicting CPU architectures ARM v7E-M vs Pre v4 in .* |