Format linker script error backtraces the same way as others (#1792)

2025-11-29 06:17:48 +00:00 · 2025-08-12 16:58:17 -04:00
parent 1bf1219e07
commit 50d0b101c3
28 changed files with 181 additions and 101 deletions
--- a/test/link/linkerscript-escapes-test.out
+++ b/test/link/linkerscript-escapes-test.out
@@ -1,2 +1,3 @@
-error: linkerscript-escapes-test.link(4): Cannot escape character '{'
+error: Cannot escape character '{'
+    at linkerscript-escapes-test.link(4)
 Linking failed with 1 error
--- a/test/link/linkerscript-include.out
+++ b/test/link/linkerscript-include.out
@@ -1,2 +1,3 @@
-error: linkerscript-include.inc(1): The linker script assigns section "test" to address $0000, but it was already at $002a
+error: The linker script assigns section "test" to address $0000, but it was already at $002a
+    at linkerscript-include.inc(1) <- linkerscript-include.link(4)
 Linking failed with 1 error
--- a/test/link/linkerscript-noexist.out
+++ b/test/link/linkerscript-noexist.out
@@ -1,2 +1,3 @@
-error: linkerscript-noexist.link(1): Failed to open included linker script "linkerscript-noexist.inc": No such file or directory
+error: Failed to open included linker script "linkerscript-noexist.inc": No such file or directory
+    at linkerscript-noexist.link(1)
 Linking failed with 1 error
--- a/test/link/script-align-17.out
+++ b/test/link/script-align-17.out
@@ -1,2 +1,3 @@
-error: script-align-17.link(2): Cannot align: The alignment (17) must be less than 16
+error: Cannot align: The alignment (17) must be less than 16
+    at script-align-17.link(2)
 Linking failed with 1 error
--- a/test/link/script-different-bank.out
+++ b/test/link/script-different-bank.out
@@ -1,2 +1,3 @@
-error: script-different-bank.link(2): The linker script places section "ROM1" in ROMX bank 2, but it was already defined in bank 1
+error: The linker script places section "ROM1" in ROMX bank 2, but it was already defined in bank 1
+    at script-different-bank.link(2)
 Linking failed with 1 error
--- a/test/link/script-different-type.out
+++ b/test/link/script-different-type.out
@@ -1,2 +1,3 @@
-error: script-different-type.link(2): "ROM1" is specified to be a SRAM section, but it is already a ROMX section
+error: "ROM1" is specified to be a SRAM section, but it is already a ROMX section
+    at script-different-type.link(2)
 Linking failed with 1 error
--- a/test/link/script-ds-overflow.out
+++ b/test/link/script-ds-overflow.out
@@ -1,3 +1,5 @@
-error: script-ds-overflow.link(3): Cannot increase the current address by 1 bytes: only 0 bytes to $4000
-error: script-ds-overflow.link(7): Cannot increase the current address by 65535 bytes: only 0 bytes to $ffff
+error: Cannot increase the current address by 1 bytes: only 0 bytes to $4000
+    at script-ds-overflow.link(3)
+error: Cannot increase the current address by 65535 bytes: only 0 bytes to $ffff
+    at script-ds-overflow.link(7)
 Linking failed with 2 errors
--- a/test/link/script-excess-align-ofs.out
+++ b/test/link/script-excess-align-ofs.out
@@ -1,2 +1,3 @@
-error: script-excess-align-ofs.link(2): Cannot align: The alignment offset (2) must be less than alignment size (2)
+error: Cannot align: The alignment offset (2) must be less than alignment size (2)
+    at script-excess-align-ofs.link(2)
 Linking failed with 1 error
--- a/test/link/script-huge-ds.out
+++ b/test/link/script-huge-ds.out
@@ -1,2 +1,3 @@
-error: script-huge-ds.link(2): Cannot increase the current address by 65536 bytes: only 16384 bytes to $4000
+error: Cannot increase the current address by 65536 bytes: only 16384 bytes to $4000
+    at script-huge-ds.link(2)
 Linking failed with 1 error
--- a/test/link/script-lone-dollar.out
+++ b/test/link/script-lone-dollar.out
@@ -1,2 +1,3 @@
-error: script-lone-dollar.link(1): No hexadecimal digits found after '$'
+error: No hexadecimal digits found after '$'
+    at script-lone-dollar.link(1)
 Linking failed with 1 error
--- a/test/link/script-lone-percent.out
+++ b/test/link/script-lone-percent.out
@@ -1,2 +1,3 @@
-error: script-lone-percent.link(1): No binary digits found after '%'
+error: No binary digits found after '%'
+    at script-lone-percent.link(1)
 Linking failed with 1 error
--- a/test/link/script-missing-bank-no.out
+++ b/test/link/script-missing-bank-no.out
@@ -1,5 +1,9 @@
-error: script-missing-bank-no.link(2): A bank number must be specified for ROMX
-error: script-missing-bank-no.link(3): A bank number must be specified for VRAM
-error: script-missing-bank-no.link(4): A bank number must be specified for SRAM
-error: script-missing-bank-no.link(6): A bank number must be specified for WRAMX
+error: A bank number must be specified for ROMX
+    at script-missing-bank-no.link(2)
+error: A bank number must be specified for VRAM
+    at script-missing-bank-no.link(3)
+error: A bank number must be specified for SRAM
+    at script-missing-bank-no.link(4)
+error: A bank number must be specified for WRAMX
+    at script-missing-bank-no.link(6)
 Linking failed with 4 errors
--- a/test/link/script-num-fmt.out
+++ b/test/link/script-num-fmt.out
@@ -1,2 +1,3 @@
-error: script-num-fmt.link(9): Cannot decrease the current address (from $002a to $0029)
+error: Cannot decrease the current address (from $002a to $0029)
+    at script-num-fmt.link(9)
 Linking failed with 1 error
--- a/test/link/script-oob-bank-num.out
+++ b/test/link/script-oob-bank-num.out
@@ -1,9 +1,17 @@
-error: script-oob-bank-num.link(1): ROM0 bank 1 does not exist (the maximum is 0)
-error: script-oob-bank-num.link(2): ROMX bank 0 does not exist (the minimum is 1)
-error: script-oob-bank-num.link(3): VRAM bank 2 does not exist (the maximum is 1)
-error: script-oob-bank-num.link(4): WRAM0 bank 1 does not exist (the maximum is 0)
-error: script-oob-bank-num.link(5): WRAMX bank 0 does not exist (the minimum is 1)
-error: script-oob-bank-num.link(6): WRAMX bank 8 does not exist (the maximum is 7)
-error: script-oob-bank-num.link(7): OAM bank 1 does not exist (the maximum is 0)
-error: script-oob-bank-num.link(8): HRAM bank 1 does not exist (the maximum is 0)
+error: ROM0 bank 1 does not exist (the maximum is 0)
+    at script-oob-bank-num.link(1)
+error: ROMX bank 0 does not exist (the minimum is 1)
+    at script-oob-bank-num.link(2)
+error: VRAM bank 2 does not exist (the maximum is 1)
+    at script-oob-bank-num.link(3)
+error: WRAM0 bank 1 does not exist (the maximum is 0)
+    at script-oob-bank-num.link(4)
+error: WRAMX bank 0 does not exist (the minimum is 1)
+    at script-oob-bank-num.link(5)
+error: WRAMX bank 8 does not exist (the maximum is 7)
+    at script-oob-bank-num.link(6)
+error: OAM bank 1 does not exist (the maximum is 0)
+    at script-oob-bank-num.link(7)
+error: HRAM bank 1 does not exist (the maximum is 0)
+    at script-oob-bank-num.link(8)
 Linking failed with 8 errors
--- a/test/link/script-oob-org.out
+++ b/test/link/script-oob-org.out
@@ -1,10 +1,19 @@
-error: script-oob-org.link(2): Cannot set the current address to $4000: ROM0 ends at $3fff
-error: script-oob-org.link(3): Cannot set the current address to $4001: ROM0 ends at $3fff
-error: script-oob-org.link(6): Cannot decrease the current address (from $4000 to $3fff)
-error: script-oob-org.link(7): Cannot set the current address to $8000: ROMX ends at $7fff
-error: script-oob-org.link(8): Cannot set the current address to $8001: ROMX ends at $7fff
-error: script-oob-org.link(11): Cannot decrease the current address (from $ff80 to $0000)
-error: script-oob-org.link(12): Cannot decrease the current address (from $ff80 to $ff7f)
-error: script-oob-org.link(14): Cannot set the current address to $ffff: HRAM ends at $fffe
-error: script-oob-org.link(15): Cannot set the current address to $10000: HRAM ends at $fffe
+error: Cannot set the current address to $4000: ROM0 ends at $3fff
+    at script-oob-org.link(2)
+error: Cannot set the current address to $4001: ROM0 ends at $3fff
+    at script-oob-org.link(3)
+error: Cannot decrease the current address (from $4000 to $3fff)
+    at script-oob-org.link(6)
+error: Cannot set the current address to $8000: ROMX ends at $7fff
+    at script-oob-org.link(7)
+error: Cannot set the current address to $8001: ROMX ends at $7fff
+    at script-oob-org.link(8)
+error: Cannot decrease the current address (from $ff80 to $0000)
+    at script-oob-org.link(11)
+error: Cannot decrease the current address (from $ff80 to $ff7f)
+    at script-oob-org.link(12)
+error: Cannot set the current address to $ffff: HRAM ends at $fffe
+    at script-oob-org.link(14)
+error: Cannot set the current address to $10000: HRAM ends at $fffe
+    at script-oob-org.link(15)
 Linking failed with 9 errors
--- a/test/link/script-overflowing-sect.out
+++ b/test/link/script-overflowing-sect.out
@@ -1,2 +1,3 @@
-error: script-overflowing-sect.link(5): The linker script assigns section "ROM2 1" to address $8000, but then it would overflow ROMX by 1 byte
+error: The linker script assigns section "ROM2 1" to address $8000, but then it would overflow ROMX by 1 byte
+    at script-overflowing-sect.link(5)
 Linking failed with 1 error
--- a/test/link/script-syntax-error.out
+++ b/test/link/script-syntax-error.out
@@ -1,3 +1,5 @@
-error: script-syntax-error.link(2): syntax error, unexpected ORG, expecting end of line or OPTIONAL
-error: script-syntax-error.link(5): syntax error, unexpected string, expecting end of line or FLOATING or number
+error: syntax error, unexpected ORG, expecting end of line or OPTIONAL
+    at script-syntax-error.link(2)
+error: syntax error, unexpected string, expecting end of line or FLOATING or number
+    at script-syntax-error.link(5)
 Linking failed with 2 errors
--- a/test/link/script-typeless-bank.out
+++ b/test/link/script-typeless-bank.out
@@ -1,2 +1,3 @@
-error: script-typeless-bank.link(1): No memory region has been specified to place section "The section isn't even known" in
+error: No memory region has been specified to place section "The section isn't even known" in
+    at script-typeless-bank.link(1)
 Linking failed with 1 error
--- a/test/link/script-unk-keyword.out
+++ b/test/link/script-unk-keyword.out
@@ -1,2 +1,3 @@
-error: script-unk-keyword.link(1): Unknown keyword `bonjour`
+error: Unknown keyword `bonjour`
+    at script-unk-keyword.link(1)
 Linking failed with 1 error
--- a/test/link/script-unknown-section.out
+++ b/test/link/script-unknown-section.out
@@ -1,2 +1,3 @@
-error: script-unknown-section.link(2): Undefined section "Wheeee"
+error: Undefined section "Wheeee"
+    at script-unknown-section.link(2)
 Linking failed with 1 error
--- a/test/link/script-unterminated-string.out
+++ b/test/link/script-unterminated-string.out
@@ -1,4 +1,7 @@
-error: script-unterminated-string.link(2): Unterminated string
-error: script-unterminated-string.link(4): Unterminated string
-error: script-unterminated-string.link(5): Unterminated string
+error: Unterminated string
+    at script-unterminated-string.link(2)
+error: Unterminated string
+    at script-unterminated-string.link(4)
+error: Unterminated string
+    at script-unterminated-string.link(5)
 Linking failed with 3 errors
--- a/test/link/section-attributes-mismatch.out
+++ b/test/link/section-attributes-mismatch.out
@@ -1,2 +1,3 @@
-error: section-attributes-mismatch.link(3): The linker script assigns section "sec" to address $0018, but that would be ALIGN[4, 8] instead of the requested ALIGN[4, 2]
+error: The linker script assigns section "sec" to address $0018, but that would be ALIGN[4, 8] instead of the requested ALIGN[4, 2]
+    at section-attributes-mismatch.link(3)
 Linking failed with 1 error