diff --git a/test/asm/label-redefinition.err b/test/asm/label-redefinition.err index 09eb79b3..1880de77 100644 --- a/test/asm/label-redefinition.err +++ b/test/asm/label-redefinition.err @@ -1,3 +1,3 @@ ERROR: label-redefinition.asm(7): - 'Sym' already defined in label-redefinition.asm::m(6) + 'Sym' already defined in label-redefinition.asm::m(4) error: Assembly aborted (1 errors)! diff --git a/test/link/section-union/align-conflict.out b/test/link/section-union/align-conflict.out index d29b7b97..0a9a98eb 100644 --- a/test/link/section-union/align-conflict.out +++ b/test/link/section-union/align-conflict.out @@ -1,6 +1,6 @@ error: Section "conflicting alignment" is defined with conflicting 4-byte alignment (offset 0) and address $cafe --- -ERROR: -(18): +ERROR: (18): Section "conflicting alignment" already declared as aligned to 4 bytes (offset 0) -ERROR: -(18): +FATAL: (18): Cannot create section "conflicting alignment" (1 errors) diff --git a/test/link/section-union/align-ofs-conflict.out b/test/link/section-union/align-ofs-conflict.out index 08cc5929..6a545f34 100644 --- a/test/link/section-union/align-ofs-conflict.out +++ b/test/link/section-union/align-ofs-conflict.out @@ -1,6 +1,6 @@ error: Section "conflicting alignment" is defined with conflicting 8-byte alignment (offset 7) and 16-byte alignment (offset 14) --- -ERROR: -(18): +ERROR: (18): Section "conflicting alignment" already declared with incompatible 3-byte alignment (offset 7) -ERROR: -(18): +FATAL: (18): Cannot create section "conflicting alignment" (1 errors) diff --git a/test/link/section-union/assert.out b/test/link/section-union/assert.out index c50272d9..fa3c90e5 100644 --- a/test/link/section-union/assert.out +++ b/test/link/section-union/assert.out @@ -1,6 +1,6 @@ error: section-union/assert.asm(11): Force failing the build Linking failed with 1 error --- -ERROR: -(30): +ERROR: (30): Assertion failed: Force failing the build error: Assembly aborted (1 errors)! diff --git a/test/link/section-union/bad-types.out b/test/link/section-union/bad-types.out index bd5fdfcf..1fcd01a1 100644 --- a/test/link/section-union/bad-types.out +++ b/test/link/section-union/bad-types.out @@ -1,6 +1,6 @@ error: Section "conflicting types" is defined with conflicting types HRAM and WRAM0 --- -ERROR: -(18): +ERROR: (18): Section "conflicting types" already exists but with type HRAM -ERROR: -(18): +FATAL: (18): Cannot create section "conflicting types" (1 errors) diff --git a/test/link/section-union/bank-conflict.out b/test/link/section-union/bank-conflict.out index c806274f..2d16cff8 100644 --- a/test/link/section-union/bank-conflict.out +++ b/test/link/section-union/bank-conflict.out @@ -1,6 +1,6 @@ error: Section "conflicting banks" is defined with conflicting banks 4 and 1 --- -ERROR: -(14): +ERROR: (14): Section "conflicting banks" already declared with different bank 4 -ERROR: -(14): +FATAL: (14): Cannot create section "conflicting banks" (1 errors) diff --git a/test/link/section-union/data-overlay.out b/test/link/section-union/data-overlay.out index b2cfb039..d504ce95 100644 --- a/test/link/section-union/data-overlay.out +++ b/test/link/section-union/data-overlay.out @@ -1,6 +1,6 @@ error: Section "overlaid data" is of type ROM0, which cannot be unionized --- -ERROR: -(18): +ERROR: (18): Cannot declare ROM sections as UNION -ERROR: -(18): +FATAL: (18): Cannot create section "overlaid data" (1 errors) diff --git a/test/link/section-union/different-data.out b/test/link/section-union/different-data.out index 46619e1c..4357cd59 100644 --- a/test/link/section-union/different-data.out +++ b/test/link/section-union/different-data.out @@ -1,6 +1,6 @@ error: Section "different data" is of type ROM0, which cannot be unionized --- -ERROR: -(16): +ERROR: (16): Cannot declare ROM sections as UNION -ERROR: -(16): +FATAL: (16): Cannot create section "different data" (1 errors) diff --git a/test/link/section-union/different-ofs.out b/test/link/section-union/different-ofs.out index c897549f..ee86d285 100644 --- a/test/link/section-union/different-ofs.out +++ b/test/link/section-union/different-ofs.out @@ -1,6 +1,6 @@ error: Section "conflicting alignment" is defined with conflicting 8-byte alignment (offset 7) and 8-byte alignment (offset 6) --- -ERROR: -(18): +ERROR: (18): Section "conflicting alignment" already declared with incompatible 3-byte alignment (offset 7) -ERROR: -(18): +FATAL: (18): Cannot create section "conflicting alignment" (1 errors) diff --git a/test/link/section-union/different-size.out b/test/link/section-union/different-size.out index bc6131f6..16089d5e 100644 --- a/test/link/section-union/different-size.out +++ b/test/link/section-union/different-size.out @@ -1,6 +1,6 @@ error: Section "different section sizes" is of type ROM0, which cannot be unionized --- -ERROR: -(16): +ERROR: (16): Cannot declare ROM sections as UNION -ERROR: -(16): +FATAL: (16): Cannot create section "different section sizes" (1 errors) diff --git a/test/link/section-union/different-syntaxes.out b/test/link/section-union/different-syntaxes.out index 52dd7709..8e5b8084 100644 --- a/test/link/section-union/different-syntaxes.out +++ b/test/link/section-union/different-syntaxes.out @@ -1,6 +1,6 @@ error: Section "different syntaxes" is of type ROM0, which cannot be unionized --- -ERROR: -(18): +ERROR: (18): Cannot declare ROM sections as UNION -ERROR: -(18): +FATAL: (18): Cannot create section "different syntaxes" (1 errors) diff --git a/test/link/section-union/org-conflict.out b/test/link/section-union/org-conflict.out index b5a332ec..7c0140da 100644 --- a/test/link/section-union/org-conflict.out +++ b/test/link/section-union/org-conflict.out @@ -1,6 +1,6 @@ error: Section "conflicting address" is defined with conflicting addresses $beef and $babe --- -ERROR: -(16): +ERROR: (16): Section "conflicting address" already declared as fixed at different address $beef -ERROR: -(16): +FATAL: (16): Cannot create section "conflicting address" (1 errors) diff --git a/test/link/section-union/split-data.out b/test/link/section-union/split-data.out index 36db397f..8bd67193 100644 --- a/test/link/section-union/split-data.out +++ b/test/link/section-union/split-data.out @@ -1,6 +1,6 @@ error: Section "mutually-overlaid data" is of type ROM0, which cannot be unionized --- -ERROR: -(18): +ERROR: (18): Cannot declare ROM sections as UNION -ERROR: -(18): +FATAL: (18): Cannot create section "mutually-overlaid data" (1 errors)