Fix test cases that check addresses that are not always invariable

[shenhan]

Summary

D45788 (later reverted) breaks a few test cases, because they check address that are not always invariable (under some condition).

All 4 test case failures are caused by the variable size of .dynstr, which contains absolute path to some .so file. So any section that are placed after .dynstr may have a variable address, check statements asserting those values are flaky.

D45788 makes this more likely to happen, because D45788 rearranges output sections, so .dynstr is usually placed at the beginning of "A" sections.

[grimar]

Cool that you found the reason! Thanks! I suggest to fix it in a bit different way.

Lets use -soname to fix up the name in .dynstr.
I believe that you should be able to resolve this with a change of few invocations only then.
And no need to add additional comments. I think we already used this approach for the same.

test/ELF/relocation.s

3

Just add a -soname foo.so:

ld.lld %t2 -o %t2.so -shared -soname foo.so

[grimar]

Let do the next thing. I think there is no reason to have this patch separately as it makes sense only with D45788 together probably.
Please update the D45788 with this change suggested, I'll test it locally then.

[shenhan]

Thanks for the review. Fixed as suggested in D45788.

test/ELF/aarch64-copy.s

 // Page(S + A) - Page(P) = 0x40000 - 0x20000 = 0x20000 = 131072
 // CODE-NEXT:  20004: {{.*}} adrp x2, #131072
 // S(y) = 0x40010, A = 0
 // (S + A) & 0xFFF = 0x10 = 16
 // CODE-NEXT:  20008: {{.*}} add  x2, x2, #16
 
 // RODATA: Contents of section .rodata:
 // S(z) = 0x40014
-// RODATA-NEXT:  10282 14000400
+
+// Caution: do not use absolute address below, .rodata is after .dynstr, which
+// contains absolute path to aarch64-copy.s.tmp2.so, so .rodata may start
+// at different address on different systems.
+// RODATA-NEXT:  {{.*}} 14000400

test/ELF/arm-copy.s

 // ((S + A) & 0xffff0000) >> 16 = 0x1
 // CODE-NEXT:   11004:       01 20 40 e3    movt    r2, #1
 // CODE-NEXT:   11008:       04 30 9f e5    ldr     r3, [pc, #4]
 // CODE-NEXT:   1100c:       00 30 93 e5    ldr     r3, [r3]
 
 
 // RODATA: Contents of section .rodata:
 // S(z) = 0x13004
-// RODATA-NEXT: 10198 04300100
+
+// Caution: do not use absolute address below, .rodata is after .dynstr, which
+// contains absolute path to arm-copy.s.tmp2.so, so .rodata may start
+// at different address on different systems.
+// RODATA-NEXT: {{.*}} 04300100

test/ELF/relocation.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2
 // RUN: ld.lld %t2 -o %t2.so -shared
 // RUN: ld.lld --hash-style=sysv %t %t2.so -o %t3
 // RUN: llvm-readobj -s  %t3 | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -s -d %t3 | FileCheck %s
 // REQUIRES: x86
 
 // SEC:      Name: .plt
 // SEC-NEXT: Type: SHT_PROGBITS
 // SEC-NEXT: Flags [

 // plt is  at 0x201030. The second plt entry is at 0x201050 == 69712
 // CHECK:      Disassembly of section .R_X86_64_32S_2:
 // CHECK-NEXT: R_X86_64_32S_2:
 // CHECK-NEXT: 201021: {{.*}}  movl    2101328, %eax
 
 .section .R_X86_64_64,"a",@progbits
 .global R_X86_64_64
 R_X86_64_64:
- .quad R_X86_64_64
+ .quad 4022250974
 
 // CHECK:      Contents of section .R_X86_64_64:
-// CHECK-NEXT:   200287 87022000 00000000
+// CHECK-NEXT:   {{.*}} deadbeef 00000000
 
 .section .R_X86_64_GOTPCREL,"a",@progbits
 .global R_X86_64_GOTPCREL
 R_X86_64_GOTPCREL:
  .long zed@gotpcrel
-
-// 0x2020F8 - 0x2001D8 = 7952
-// 7952 = 0x101f0000 in little endian
-// CHECK:      Contents of section .R_X86_64_GOTPCREL
-// CHECK-NEXT:   20028f 612e0000
+//     ^^^^^^^^^^^^
+// Note: the above value of .R_X86_64_GOTPCREL is not always a fixed value.
+// The value is calculated by: .got - (.R_X86_64_GOTPCREL+0)
+// When linker arranges sections into below segments:
+//   01     .dynsym .dynstr .R_X86_64_64 .R_X86_64_GOTPCREL ...
+//   02     .text .text2 .R_X86_64_32S .R_X86_64_PC32 .R_X86_64_32S_2 .plt 
+//   03     .got.plt .dynamic .got
+// We see that the size of .dynstr (which contains the absolute path of 
+// "relocation.s.tmp2.so") affects the address of .R_X86_64_GOTPCREL.
+// However, the start addresses of segment 02 and 03 might not be affected,
+// because of huge alignment (usually 0x1000).
 
 .section .R_X86_64_GOT32,"a",@progbits
 .global R_X86_64_GOT32
 R_X86_64_GOT32:
         .long zed@got
 
 // CHECK: Contents of section .R_X86_64_GOT32:
 // CHECK-NEXT: f8ffffff
 
 
 // CHECK: Contents of section .R_X86_64_GOT64:
 // CHECK-NEXT: f8ffffff ffffffff
 .section .R_X86_64_GOT64,"a",@progbits
 .global R_X86_64_GOT64
 R_X86_64_GOT64:
         .quad zed@got

test/ELF/version-script-extern.s

 # DSO-NEXT:      Binding: Global (0x1)
 # DSO-NEXT:      Type: Function (0x2)
 # DSO-NEXT:      Other: 0
 # DSO-NEXT:      Section: .text (0x6)
 # DSO-NEXT:    }
 # DSO-NEXT:  ]
 # DSO-NEXT:  Version symbols {
 # DSO-NEXT:    Section Name: .gnu.version
-# DSO-NEXT:    Address: 0x300
-# DSO-NEXT:    Offset: 0x300
+// Caution: do not use absolute address below, .gnu.version is placed after
+// .dynstr, which contains absolute path to "version-script-extern.s.tmp.so",
+// so .rodata may start at different address on different systems.
+# DSO-NEXT:    Address: {{.*}}
+# DSO-NEXT:    Offset: {{.*}}
 # DSO-NEXT:    Link: 1
 # DSO-NEXT:    Symbols [
 # DSO-NEXT:      Symbol {
 # DSO-NEXT:        Version: 0
 # DSO-NEXT:        Name: @
 # DSO-NEXT:      }
 # DSO-NEXT:      Symbol {
 # DSO-NEXT:        Version: 3