[lld-macho] Have tests default to targeting macos 10.15

[int3]

Summary

D101114 enforced proper version checks, which exposed a variety of version
mismatch issues in our tests. We previously changed the test inputs to
target 10.0, which was the simpler thing to do, but we should really
just have our lit.local.cfg default to targeting 10.15, which is what is done
here. We're not likely to ever have proper support for the older versions
anyway, as that would require more work for unclear benefit; for instance,
llvm-mc seems to generate a different compact unwind format for older macOS
versions, which would cause our compact-unwind.s test to fail.

Targeting 10.15 by default causes the following behavioral changes:

• __mh_execute_header is now a section symbol instead of an absolute symbol
• LC_BUILD_VERSION gets emitted instead of LC_VERSION_MIN_MACOSX. The former is 32 bytes in size whereas the latter is 16 bytes, so a bunch of hardcoded address offsets in our tests had to be updated.
• >= 10.6 executables are PIE by default

Note that this diff is stacked atop of a local revert of most of the test
changes in rG8c17a875150f8e736e8f9061ddf084397f45f4c5, to make review easier.

[oontvoo]

Thanks!

[thakis]

Targeting 10.15 instead of 10.0 makes a lot of sense.

I do hope "We're not likely to ever have proper support for the older versions anyway" doesn't mean versions older than 10.15 though. Chromium currently supports 10.11+, and I'd love to try and ship a canary channel linked with lld at some point…

[int3]

Oh yeah for sure we should support older versions where there are use cases :)

lld/test/MachO/export-trie.s

 
 # RUN: llvm-objdump --syms --exports-trie %t | FileCheck %s --check-prefix=EXPORTS
 # EXPORTS-LABEL: SYMBOL TABLE:
 # EXPORTS-DAG:   [[#%x, MAIN_ADDR:]] {{.*}} _main
 # EXPORTS-DAG:   [[#%x, HELLO_ADDR:]] {{.*}} _hello
 # EXPORTS-DAG:   [[#%x, HELLO_WORLD_ADDR:]] {{.*}} _hello_world
 # EXPORTS-DAG:   [[#%x, HELLO_ITS_ME_ADDR:]] {{.*}} _hello_its_me
 # EXPORTS-DAG:   [[#%x, HELLO_ITS_YOU_ADDR:]] {{.*}} _hello_its_you
-# EXPORTS-DAG:   {{0+}} g *ABS* __mh_execute_header
+# EXPORTS-DAG:   [[#%x, HEADER_ADDR:]] g F __TEXT,__text __mh_execute_header
 # EXPORTS-LABEL: Exports trie:
-# EXPORTS-DAG:   0x{{0+}} __mh_execute_header [absolute]
+# EXPORTS-DAG:   0x{{0*}}[[#%X, HEADER_ADDR]] __mh_execute_header
 # EXPORTS-DAG:   0x{{0*}}[[#%X, MAIN_ADDR]] _main
 # EXPORTS-DAG:   0x{{0*}}[[#%X, HELLO_ADDR]] _hello
 # EXPORTS-DAG:   0x{{0*}}[[#%X, HELLO_WORLD_ADDR]] _hello_world
 # EXPORTS-DAG:   0x{{0*}}[[#%x, HELLO_ITS_ME_ADDR:]] _hello_its_me
 # EXPORTS-DAG:   0x{{0*}}[[#%x, HELLO_ITS_YOU_ADDR:]] _hello_its_you
 
 ## Check that we are sharing prefixes in the trie.
 # RUN: obj2yaml %t | FileCheck %s

lld/test/MachO/lit.local.cfg

 # alias for each platform.
 
 config.substitutions.append(('%lld-watchos',
     'ld64.lld -fatal_warnings -arch arm64_32 -platform_version watchos 7.0 8.0 -syslibroot ' +
     os.path.join(config.test_source_root, "MachO", "Inputs", "WatchOS.sdk")))
 
 # Since most of our tests are written around x86_64, we give this platform the
 # shortest substitution of "%lld".
-lld = ('ld64.lld -arch x86_64 -platform_version macos 10.0 11.0 -syslibroot ' +
+lld = ('ld64.lld -arch x86_64 -platform_version macos 10.15 11.0 -syslibroot ' +
     os.path.join(config.test_source_root, "MachO", "Inputs", "MacOSX.sdk"))
 config.substitutions.append(('%lld', lld + ' -fatal_warnings'))
 config.substitutions.append(('%no_fatal_warnings_lld', lld))

lld/test/MachO/load-command-sequence.s

 # COMMON: cmd LC_SYMTAB
 # COMMON: cmd LC_DYSYMTAB
 
 # EXEC: cmd LC_LOAD_DYLINKER
 # EXEC: cmd LC_MAIN
 # DYLIB: cmd LC_ID_DYLIB
 
 # COMMON: cmd LC_UUID
-# COMMON: cmd LC_VERSION_MIN_MACOSX
+# COMMON: cmd LC_BUILD_VERSION
 # COMMON: cmd LC_LOAD_DYLIB
 
 .section __TEXT,__cstring
 _str:
   .asciz "Help me! I'm trapped in a test!\n"
 
 .globl _mutable
 .section __DATA,__data

lld/test/MachO/local-got.s

 # REQUIRES: x86
 # RUN: mkdir -p %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libhello.s \
 # RUN:   -o %t/libhello.o
 # RUN: %lld -lSystem -dylib -install_name \
 # RUN:   @executable_path/libhello.dylib %t/libhello.o -o %t/libhello.dylib
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o
+
 # RUN: %lld -lSystem -o %t/test %t/test.o -L%t -lhello
-# RUN: llvm-objdump --full-contents --rebase --bind %t/test | FileCheck %s --match-full-lines
+# RUN: llvm-objdump --macho --full-contents --rebase --bind %t/test | FileCheck %s --check-prefixes=CHECK,PIE --match-full-lines
+# RUN: %lld -no_pie -lSystem -o %t/test %t/test.o -L%t -lhello
+# RUN: llvm-objdump --macho --full-contents --rebase --bind %t/test | FileCheck %s --check-prefixes=CHECK,NO-PIE --match-full-lines
 
 ## Check that the GOT references the cstrings. --full-contents displays the
 ## address offset and the contents at that address very similarly, so am using
 ## --match-full-lines to make sure we match on the right thing.
 # CHECK:      Contents of section __TEXT,__cstring:
-# CHECK-NEXT: 100000424 {{.*}}
+# CHECK-NEXT: 100000434 {{.*}}
 
 ## 1st 8 bytes refer to the start of __cstring + 0xe, 2nd 8 bytes refer to the
 ## start of __cstring
 # CHECK:      Contents of section __DATA_CONST,__got:
-# CHECK-NEXT: [[#%X,ADDR:]]  32040000 01000000 24040000 01000000 {{.*}}
+# CHECK-NEXT: [[#%X,ADDR:]]  42040000 01000000 34040000 01000000 {{.*}}
 # CHECK-NEXT: [[#ADDR + 16]] 00000000 00000000 {{.*}}
 
 ## Check that the rebase table is empty.
-# CHECK:      Rebase table:
-# CHECK-NEXT: segment      section  address         type
-
-## Check that a non-locally-defined symbol is still bound at the correct offset:
-# CHECK-NEXT: Bind table:
-# CHECK-NEXT: segment      section  address         type     addend  dylib     symbol
-# CHECK-NEXT: __DATA_CONST __got    0x[[#ADDR+16]]  pointer  0       libhello  _hello_its_me
+# NO-PIE:      Rebase table:
+# NO-PIE-NEXT: segment      section  address         type
 
-# RUN: %lld -pie -lSystem -o %t/test %t/test.o -L%t -lhello
-# RUN: llvm-objdump --macho --rebase --bind %t/test | FileCheck %s --check-prefix=PIE --match-full-lines
 # PIE:      Rebase table:
 # PIE-NEXT: segment      section  address          type
 # PIE-NEXT: __DATA_CONST __got    0x[[#%X,ADDR:]]  pointer
 # PIE-NEXT: __DATA_CONST __got    0x[[#ADDR + 8]]  pointer
 
-# PIE-NEXT: Bind table:
-# PIE-NEXT: segment      section  address          type     addend  dylib     symbol
-# PIE-NEXT: __DATA_CONST __got    0x[[#ADDR+16]]   pointer  0       libhello  _hello_its_me
+## Check that a non-locally-defined symbol is still bound at the correct offset:
+# CHECK-NEXT: Bind table:
+# CHECK-NEXT: segment      section  address         type     addend  dylib     symbol
+# CHECK-NEXT: __DATA_CONST __got    0x[[#ADDR+16]]  pointer  0       libhello  _hello_its_me
 
 .globl _main
 
 .text
 _main:
   movl $0x2000004, %eax # write() syscall
   mov $1, %rdi # stdout
   movq _hello_its_me@GOTPCREL(%rip), %rsi

lld/test/MachO/map-file.s

 # CHECK-NEXT: 0    __text        {{[0-9a-f]+}}  [[#%x,TEXT:]] TEXT
 # CHECK-NEXT: 1    obj           {{[0-9a-f]+}}  [[#%x,DATA:]] DATA
 # CHECK-NEXT: 2    __common      {{[0-9a-f]+}}  [[#%x,BSS:]]  BSS
 
 # CHECK: SYMBOL TABLE:
 # CHECK-NEXT: [[#%x,MAIN:]]   g     F __TEXT,__text _main
 # CHECK-NEXT: [[#%x,NUMBER:]] g     O __DATA,__common _number
 # CHECK-NEXT: [[#%x,FOO:]]    g     O __TEXT,obj _foo
-# CHECK-NEXT: {{0+}}          g       *ABS* __mh_execute_header
+# CHECK-NEXT: [[#%x,HEADER:]] g     F __TEXT,__text __mh_execute_header
 
 # CHECK-NEXT: # Path: {{.*}}{{/|\\}}map-file.s.tmp/test-map
 # CHECK-NEXT: # Arch: x86_64
 # CHECK-NEXT: # Object files:
 # CHECK-NEXT: [  0] linker synthesized
 # CHECK-NEXT: [  1] {{.*}}{{/|\\}}map-file.s.tmp/test.o
 # CHECK-NEXT: [  2] {{.*}}{{/|\\}}map-file.s.tmp/foo.o
 

lld/test/MachO/mh-header-link.s

 # REQUIRES: x86
 
 ## This tests that we can link against these synthetic symbols even
 ## if they are not in the symbol table.
 
 # RUN: rm -rf %t; split-file %s %t
 
 ## Test that in a dylib, we can link against __mh_dylib_header
 ## (but not in other types of files)
 
-# RUN: llvm-mc %t/dylib.s -triple=x86_64-apple-macos11.0 -filetype=obj -o %t/dylib.o
+# RUN: llvm-mc %t/dylib.s -triple=x86_64-apple-macos10.15 -filetype=obj -o %t/dylib.o
 # RUN: %lld -pie -dylib %t/dylib.o -o %t/dylib.out
 # RUN: llvm-objdump -m --syms %t/dylib.out | FileCheck %s --check-prefix DYLIB
 
 # RUN: not %lld -pie -o /dev/null %t/dylib.o 2>&1 | FileCheck %s --check-prefix ERR-DYLIB
 
 # DYLIB:      SYMBOL TABLE:
 # DYLIB-NEXT: {{[0-9a-f]+}} g     F __TEXT,__text _main
 # DYLIB-NEXT-EMPTY:
 # ERR-DYLIB: error: undefined symbol: __mh_dylib_header
 
 ## Test that in an executable, we can link against __mh_execute_header
-# RUN: llvm-mc %t/main.s -triple=x86_64-apple-macos11.0 -filetype=obj -o %t/exec.o
+# RUN: llvm-mc %t/main.s -triple=x86_64-apple-macos10.15 -filetype=obj -o %t/exec.o
 # RUN: %lld -pie %t/exec.o -o %t/exec.out
 
 ## But it would be an error trying to reference __mh_execute_header in a dylib
 # RUN: not %lld -pie -o /dev/null -dylib %t/exec.o 2>&1 | FileCheck %s --check-prefix ERR-EXEC
 
 # ERR-EXEC: error: undefined symbol: __mh_execute_header
 
 #--- main.s

lld/test/MachO/objc.s

 # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=NO-OBJC
 
 # NO-OBJC:       Sections:
 # NO-OBJC-NEXT:  Idx Name           Size   VMA  Type
 # NO-OBJC-NEXT:    0 __text         {{.*}}      TEXT
 # NO-OBJC-EMPTY:
 # NO-OBJC-NEXT:  SYMBOL TABLE:
 # NO-OBJC-NEXT:  g     F __TEXT,__text _main
-# NO-OBJC-NEXT:  g *ABS* __mh_execute_header
+# NO-OBJC-NEXT:  g     F __TEXT,__text __mh_execute_header
 # NO-OBJC-EMPTY:
 
 #--- has-objc-symbol.s
 .globl _OBJC_CLASS_$_MyObject
 _OBJC_CLASS_$_MyObject:
 
 #--- has-objc-category.s
 .section __DATA,__objc_catlist

lld/test/MachO/symtab.s

 # CHECK-NEXT:     RefType: UndefinedNonLazy (0x0)
 # CHECK-NEXT:     Flags [ (0x0)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Value: 0x1{{[0-9a-f]*}}
 # CHECK-NEXT:   }
 # CHECK-NEXT:  Symbol {
 # CHECK-NEXT:    Name: __mh_execute_header (81)
 # CHECK-NEXT:    Extern
-# CHECK-NEXT:    Type: Abs (0x2)
-# CHECK-NEXT:    Section:  (0x0)
+# CHECK-NEXT:    Type: Section (0xE)
+# CHECK-NEXT:    Section: __text (0x1)
 # CHECK-NEXT:    RefType: UndefinedNonLazy (0x0)
 # CHECK-NEXT:    Flags [ (0x0)
 # CHECK-NEXT:    ]
-# CHECK-NEXT:    Value: 0x0
+# CHECK-NEXT:    Value: 0x100000000
 # CHECK-NEXT:  }
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Name: dyld_stub_binder
 # CHECK-NEXT:     Extern
 # CHECK-NEXT:     Type: Undef (0x0)
 # CHECK-NEXT:     Section:  (0x0)
 # CHECK-NEXT:     RefType: UndefinedNonLazy (0x0)
 # CHECK-NEXT:     Flags [ (0x100)

lld/test/MachO/x86-64-reloc-unsigned.s

 # RUN: llvm-objdump --macho --rebase %t-pie | FileCheck %s --check-prefix=PIE
 # RUN: %lld -platform_version driverkit 19.0 20.0 -o %t-pie %t.o
 # RUN: llvm-objdump --macho --rebase %t-pie | FileCheck %s --check-prefix=PIE
 
 # CHECK:       Contents of section __DATA,foo:
 # CHECK-NEXT:  100001000 08100000 01000000
 # CHECK:       Contents of section __DATA,bar:
 # CHECK-NEXT:  100001008 011000f0 11211111 02000000
-# CHECK:       Rebase table:
-# CHECK-NEXT:  segment  section            address     type
-# CHECK-EMPTY:
 
 # PIE:      Rebase table:
 # PIE-NEXT: segment  section            address           type
 # PIE-DAG:  __DATA   foo                0x[[#%X,ADDR:]]   pointer
 # PIE-DAG:  __DATA   bar                0x[[#ADDR + 8]]   pointer
 # PIE-DAG:  __DATA   bar                0x[[#ADDR + 12]]  pointer
 # PIE-DAG:  __DATA   baz                0x[[#ADDR + 20]]  pointer
 

lld/test/MachO/x86-64-relocs.s

 # CHECK:       leaq [[#%u, STR_OFF:]](%rip), %rsi
 # CHECK-NEXT:  [[#%x, CSTRING_ADDR - STR_OFF]]
 ## Test non-extern (section) X86_64_RELOC_SIGNED
 # CHECK:       leaq [[#%u, LSTR_OFF:]](%rip), %rsi
 # CHECK-NEXT:  [[#%x, CSTRING_ADDR + 22 - LSTR_OFF]]
 
 # RUN: llvm-objdump --section=__const --full-contents %t | FileCheck %s --check-prefix=NONPCREL
 # NONPCREL:      Contents of section __DATA,__const:
-# NONPCREL-NEXT: 100001000 08040000 01000000 08040000 01000000
+# NONPCREL-NEXT: 100001000 18040000 01000000 18040000 01000000
 
 .section __TEXT,__text
 .globl _main, _f
 _main:
   callq _f # X86_64_RELOC_BRANCH
   mov $0, %rax
   ret
 

lld/test/MachO/x86-64-stubs.s

 # REQUIRES: x86
-# RUN: mkdir -p %t
+# RUN: rm -rf %t; mkdir -p %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libhello.s \
 # RUN:   -o %t/libhello.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libgoodbye.s \
 # RUN:   -o %t/libgoodbye.o
 # RUN: %lld -dylib \
 # RUN:   -install_name @executable_path/libhello.dylib %t/libhello.o \
 # RUN:   -o %t/libhello.dylib
 # RUN: %lld -dylib \
 # RUN:   -install_name @executable_path/libgoodbye.dylib %t/libgoodbye.o \
 # RUN:   -o %t/libgoodbye.dylib
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/dylink-lazy.o
-# RUN: %lld -o %t/dylink-lazy \
+# RUN: %lld -no_pie -o %t/dylink-lazy-no-pie \
 # RUN:   -L%t -lhello -lgoodbye %t/dylink-lazy.o -lSystem
 
 ## When looking at the __stubs section alone, we are unable to easily tell which
 ## symbol each entry points to. So we call objdump twice in order to get the
 ## disassembly of __text and the bind tables first, which allow us to check for
 ## matching entries in __stubs.
+# RUN: llvm-objdump -d --no-show-raw-insn --syms --rebase --bind --lazy-bind %t/dylink-lazy-no-pie > %t/objdump-no-pie
+# RUN: llvm-objdump -D --no-show-raw-insn %t/dylink-lazy-no-pie >> %t/objdump-no-pie
+# RUN: FileCheck %s --check-prefixes=CHECK,NO-PIE < %t/objdump-no-pie
+
+# RUN: %lld -o %t/dylink-lazy -L%t -lhello -lgoodbye %t/dylink-lazy.o -lSystem
 # RUN: llvm-objdump -d --no-show-raw-insn --syms --rebase --bind --lazy-bind %t/dylink-lazy > %t/objdump
 # RUN: llvm-objdump -D --no-show-raw-insn %t/dylink-lazy >> %t/objdump
-# RUN: FileCheck %s < %t/objdump
-
-# RUN: %lld -pie -o %t/dylink-lazy-pie \
-# RUN:   -L%t -lhello -lgoodbye %t/dylink-lazy.o -lSystem
-# RUN: llvm-objdump --macho --rebase %t/dylink-lazy-pie | FileCheck %s --check-prefix=PIE
+# RUN: FileCheck %s --check-prefixes=CHECK,PIE < %t/objdump
 
 # CHECK-LABEL: SYMBOL TABLE:
 # CHECK:       {{0*}}[[#%x, IMGLOADER:]] l {{.*}} __DATA,__data __dyld_private
 
 # CHECK-LABEL: Disassembly of section __TEXT,__text:
 # CHECK:         callq 0x[[#%x, HELLO_STUB:]]
 # CHECK-NEXT:    callq 0x[[#%x, GOODBYE_STUB:]]
 
 ## Check that the rebase table is empty.
-# CHECK-LABEL: Rebase table:
-# CHECK-NEXT:  segment section address type
+# NO-PIE-LABEL: Rebase table:
+# NO-PIE-NEXT:  segment section address type
+
+# PIE-LABEL:   Rebase table:
+# PIE-NEXT:    segment  section            address           type
+# PIE-NEXT:    __DATA   __la_symbol_ptr    0x[[#%X, ADDR:]]  pointer
+# PIE-NEXT:    __DATA   __la_symbol_ptr    0x[[#ADDR + 8]]   pointer
 
 # CHECK-NEXT:  Bind table:
 # CHECK:       __DATA_CONST __got 0x[[#%x, BINDER:]] pointer 0 libSystem dyld_stub_binder
 
 # CHECK-LABEL: Lazy bind table:
 # CHECK-DAG:   __DATA __la_symbol_ptr 0x{{0*}}[[#%x, HELLO_LAZY_PTR:]] libhello _print_hello
 # CHECK-DAG:   __DATA __la_symbol_ptr 0x{{0*}}[[#%x, GOODBYE_LAZY_PTR:]] libgoodbye _print_goodbye
 
 # CHECK-LABEL: Disassembly of section __TEXT,__stubs:
 # CHECK-DAG:     [[#%x, HELLO_STUB]]:   jmpq *[[#%u, HELLO_LAZY_PTR - HELLO_STUB - 6]](%rip)
 # CHECK-DAG:     [[#%x, GOODBYE_STUB]]: jmpq *[[#%u, GOODBYE_LAZY_PTR - GOODBYE_STUB - 6]](%rip)
 
 # CHECK-LABEL: Disassembly of section __TEXT,__stub_helper:
 # CHECK:         {{0*}}[[#%x, STUB_HELPER_ENTRY:]] <__stub_helper>:
 # CHECK-NEXT:    leaq [[#%u, IMGLOADER - STUB_HELPER_ENTRY - 7]](%rip), %r11
 # CHECK-NEXT:    pushq %r11
 # CHECK-NEXT:    jmpq *[[#%u, BINDER_OFF:]](%rip)
 # CHECK-NEXT:    [[#%x, BINDER - BINDER_OFF]]: nop
 # CHECK-NEXT:    pushq $0
 # CHECK-NEXT:    jmp 0x[[#STUB_HELPER_ENTRY]]
 # CHECK-NEXT:    pushq $21
 # CHECK-NEXT:    jmp 0x[[#STUB_HELPER_ENTRY]]
 
-# PIE:         Rebase table:
-# PIE-NEXT:    segment  section            address           type
-# PIE-NEXT:    __DATA   __la_symbol_ptr    0x[[#%X, ADDR:]]  pointer
-# PIE-NEXT:    __DATA   __la_symbol_ptr    0x[[#ADDR + 8]]   pointer
-
 .text
 .globl _main
 
 _main:
   sub $8, %rsp # 16-byte-align the stack; dyld checks for this
   callq _print_hello
   callq _print_goodbye
   add $8, %rsp
   ret