improve test

Author: MaskRay

lld/ELF/LinkerScript.cpp

@@ -175,7 +175,7 @@ void LinkerScript::setDot(Expr e, const Twine &loc, bool inSec) {
   if (val < dot && inSec) {
     backwardDotErr =
         (loc + ": unable to move location counter (0x" + Twine::utohexstr(dot) +
-         ") backward (0x" + Twine::utohexstr(val) + ") for section '" +
+         ") backward to 0x" + Twine::utohexstr(val) + " for section '" +
          state->outSec->name + "'")
             .str();
   }

lld/test/ELF/linkerscript/locationcountererr-arm-exidx.test

@@ -3,21 +3,29 @@
 # RUN: llvm-mc -filetype=obj -triple=armv7-linux-gnueabi a.s -o a.o
 
 ## If we don't merge adjacent duplicate entries, __code_size will be negative and
-## . += __code_size will trigger an error.
-# RUN: not ld.lld -z norelro -T a.t a.o -o /dev/null --no-merge-exidx-entries 2>&1 | FileCheck %s --check-prefix=ERR
+## . += __code_size will trigger a "move location counter backward" error.
+## LLD may report more errors further down, but there is only one "move location counter backward" error.
+# RUN: not ld.lld -z norelro -z max-page-size=4096 -T a.t a.o -o /dev/null --no-merge-exidx-entries 2>&1 | \
+# RUN:   FileCheck %s --check-prefix=ERR --implicit-check-not=error:
 
-# ERR: a.t:10: unable to move location counter (0x4104) backward (0x4070) for section 'code.unused_space'
+# ERR:      error: a.t:14: unable to move location counter (0x4104) backward to 0x4070 for section 'code.unused_space'
+# ERR-NEXT: error: section '.ARM.exidx' will not fit in region 'CODE': overflowed by 148 bytes
+# ERR-NEXT: error: section dummy1 at 0x1000 of size 0xFFFFFFFFFFFFFF6C exceeds available address space
+# ERR-NEXT: error: section dummy2 at 0x2000 of size 0xFFFFFFFFFFFFFF6C exceeds available address space
+# ERR-NEXT: error: section code.unused_space at 0x4104 of size 0xFFFFFFFFFFFFFF6C exceeds available address space
 
 ## If we merge adjacent duplicate entries, we will have enough space. Don't report
 ## a spurious error https://github.com/llvm/llvm-project/issues/66836
-# RUN: ld.lld -z norelro -T a.t a.o -o a
+# RUN: ld.lld -z norelro -z max-page-size=4096 -T a.t a.o -o a
 # RUN: llvm-readelf -S a | FileCheck %s
 
 # CHECK:       [Nr] Name              Type            Address  Off    Size   ES Flg Lk Inf Al
 # CHECK-NEXT:  [ 0]                   NULL            00000000 000000 000000 00      0   0  0
-# CHECK-NEXT:  [ 1] .text             PROGBITS        00004000 004000 000054 00  AX  0   0  4
-# CHECK-NEXT:  [ 2] .ARM.exidx        ARM_EXIDX       00004054 004054 000010 00  AL  1   0  4
-# CHECK-NEXT:  [ 3] code.unused_space NOBITS          00004064 004064 00000c 00   A  0   0  1
+# CHECK-NEXT:  [ 1] dummy1            NOBITS          00001000 001000 00000c 00   A  0   0  1
+# CHECK-NEXT:  [ 2] dummy2            NOBITS          00002000 001000 00000c 00   A  0   0  1
+# CHECK-NEXT:  [ 3] .text             PROGBITS        00004000 001000 000054 00  AX  0   0  4
+# CHECK-NEXT:  [ 4] .ARM.exidx        ARM_EXIDX       00004054 001054 000010 00  AL  3   0  4
+# CHECK-NEXT:  [ 5] code.unused_space NOBITS          00004064 001064 00000c 00   A  0   0  1
 
 #--- a.s
 .globl _start
@@ -40,13 +48,17 @@ f\@:
 
 #--- a.t
 MEMORY {
+  DUMMY1 (RW) : ORIGIN = 0x1000, LENGTH = 0x70
+  DUMMY2 (RW) : ORIGIN = 0x2000, LENGTH = 0x70
   CODE (RX) : ORIGIN = 0x4000, LENGTH = 0x70
 }
-__code_end = ORIGIN(CODE) + LENGTH(CODE);
+code_end = ORIGIN(CODE) + LENGTH(CODE);
 
 SECTIONS {
+  dummy1 (NOLOAD) : { . += code_size; } > DUMMY1
+  dummy2 (NOLOAD) : { . += code_size; } > DUMMY2
   .text : { *(.text .text.*) } > CODE
   .ARM.exidx : { *(.ARM.exidx .ARM.exidx.*) } > CODE
-  __code_size = __code_end - .;
-  code.unused_space (NOLOAD) : { . += __code_size; } > CODE
+  code_size = code_end - .;
+  code.unused_space (NOLOAD) : { . += code_size; } > CODE
 }

lld/test/ELF/linkerscript/locationcountererr.test

@@ -1,7 +1,7 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux /dev/null -o %t
 # RUN: not ld.lld %t --script %s -o /dev/null 2>&1 | FileCheck %s
-# CHECK: {{.*}}.test:8: unable to move location counter (0x2000) backward (0x10) for section '.text'
+# CHECK: {{.*}}.test:8: unable to move location counter (0x2000) backward to 0x10 for section '.text'
 
 SECTIONS {
   .text 0x2000 : {