aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@arm.com>2022-11-02 16:50:15 +0000
committerChristophe Lyon <christophe.lyon@arm.com>2022-11-02 17:58:53 +0000
commit7eb96b2f0359aa8cc1134fc6af4865f59e71d884 (patch)
tree93d85464227635034e862be6b14efeac062ccaa0 /ld
parentfde7c6bf646146aa342919b413dff07f558d55dc (diff)
downloadfsf-binutils-gdb-7eb96b2f0359aa8cc1134fc6af4865f59e71d884.zip
fsf-binutils-gdb-7eb96b2f0359aa8cc1134fc6af4865f59e71d884.tar.gz
fsf-binutils-gdb-7eb96b2f0359aa8cc1134fc6af4865f59e71d884.tar.bz2
arm: PR 29739 Fix typo where ';' should not have been replaced with '@'
';' does not always indicate the start of a comment, and commit 8cb6e17571f3fb66ccd4fa19f881602542cd06fc incorrectly replaced 3 instances of ';' with '@' in expected diagnostics, leading to tests failures. This patch restores the original ';' as needed in these testcases. Fixes bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29739
Diffstat (limited to 'ld')
-rw-r--r--ld/testsuite/ld-arm/attr-merge-wchar-24.d2
-rw-r--r--ld/testsuite/ld-arm/attr-merge-wchar-42.d2
-rw-r--r--ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d2
3 files changed, 3 insertions, 3 deletions
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-24.d b/ld/testsuite/ld-arm/attr-merge-wchar-24.d
index 92a26ab..46d6c66 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-24.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-24.d
@@ -2,4 +2,4 @@
#source: attr-merge-wchar-4.s
#as:
#ld: -r
-#warning: warning: .* uses 4-byte wchar_t yet the output is to use 2-byte wchar_t@ use of wchar_t values across objects may fail
+#warning: warning: .* uses 4-byte wchar_t yet the output is to use 2-byte wchar_t; use of wchar_t values across objects may fail
diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-42.d b/ld/testsuite/ld-arm/attr-merge-wchar-42.d
index 274cdc8..c2aca5e 100644
--- a/ld/testsuite/ld-arm/attr-merge-wchar-42.d
+++ b/ld/testsuite/ld-arm/attr-merge-wchar-42.d
@@ -2,4 +2,4 @@
#source: attr-merge-wchar-2.s
#as:
#ld: -r
-#warning: warning: .* uses 2-byte wchar_t yet the output is to use 4-byte wchar_t@ use of wchar_t values across objects may fail
+#warning: warning: .* uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail
diff --git a/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d b/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d
index 13b2838..8e785c6 100644
--- a/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d
+++ b/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d
@@ -3,7 +3,7 @@
#ld:-EL --fix-stm32l4xx-629360 -Ttext=0x80000
#objdump: -dr --prefix-addresses --show-raw-insn
#name: STM32L4XX erratum : LDM cannot be patched when LDM is too far from veneer section
-#warning: .*cannot create STM32L4XX veneer@ jump out of range by 24 bytes; cannot encode branch instruction.*
+#warning: .*cannot create STM32L4XX veneer; jump out of range by 24 bytes; cannot encode branch instruction.*
# Test the `LDM*' instructions when too far from the veneer section
# They cannot, thus should not, be patched