diff options
| author | Jez Ng <jezng@fb.com> | 2020-09-18 21:40:12 -0700 |
|---|---|---|
| committer | Jez Ng <jezng@fb.com> | 2020-09-25 11:28:36 -0700 |
| commit | 643ec67a64ad7a686361b1d309e5088ad8f228e9 (patch) | |
| tree | 9aa4de0334f00201728c53ac6fd66f8b96da2def /lld | |
| parent | 62a3f0c9844bb89a48173440145b26212be60f83 (diff) | |
| download | llvm-643ec67a64ad7a686361b1d309e5088ad8f228e9.zip llvm-643ec67a64ad7a686361b1d309e5088ad8f228e9.tar.gz llvm-643ec67a64ad7a686361b1d309e5088ad8f228e9.tar.bz2 | |
[lld-macho] Always include custom syslibroot when running tests
This greatly reduces the amount of boilerplate in our tests.
Reviewed By: #lld-macho, compnerd
Differential Revision: https://reviews.llvm.org/D87960
Diffstat (limited to 'lld')
89 files changed, 280 insertions, 273 deletions
diff --git a/lld/test/MachO/abs-symbols.s b/lld/test/MachO/abs-symbols.s index 25f6c87..9c0ecb2 100644 --- a/lld/test/MachO/abs-symbols.s +++ b/lld/test/MachO/abs-symbols.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem %t.o -o %t +# RUN: %lld -lSystem %t.o -o %t # RUN: llvm-objdump --macho --syms --exports-trie %t | FileCheck %s # CHECK-LABEL: SYMBOL TABLE: diff --git a/lld/test/MachO/arch.s b/lld/test/MachO/arch.s index a0a1962..972a137 100644 --- a/lld/test/MachO/arch.s +++ b/lld/test/MachO/arch.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o /dev/null %t.o -# RUN: not lld -flavor darwinnew -arch i386 -o /dev/null %t.o 2>&1 | FileCheck %s +# RUN: %lld -o /dev/null %t.o +# RUN: not %lld -arch i386 -o /dev/null %t.o 2>&1 | FileCheck %s # CHECK: error: missing or unsupported -arch i386 .text diff --git a/lld/test/MachO/archive.s b/lld/test/MachO/archive.s index cb81fb0..abde623 100644 --- a/lld/test/MachO/archive.s +++ b/lld/test/MachO/archive.s @@ -7,7 +7,7 @@ # RUN: rm -f %t/test.a # RUN: llvm-ar rcs %t/test.a %t/2.o %t/3.o %t/4.o -# RUN: lld -flavor darwinnew %t/main.o %t/test.a -o %t/test.out +# RUN: %lld %t/main.o %t/test.a -o %t/test.out ## TODO: Run llvm-nm -p to validate symbol order # RUN: llvm-nm %t/test.out | FileCheck %s @@ -16,7 +16,7 @@ # CHECK: T _main ## Linking with the archive first in the command line shouldn't change anything -# RUN: lld -flavor darwinnew %t/test.a %t/main.o -o %t/test.out +# RUN: %lld %t/test.a %t/main.o -o %t/test.out # RUN: llvm-nm %t/test.out | FileCheck %s --check-prefix ARCHIVE-FIRST # ARCHIVE-FIRST: T _bar # ARCHIVE-FIRST: T _boo @@ -26,7 +26,7 @@ # VISIBLE-NOT: T _undefined # VISIBLE-NOT: T _unused -# RUN: lld -flavor darwinnew %t/test.a %t/main.o -o %t/all-load -all_load +# RUN: %lld %t/test.a %t/main.o -o %t/all-load -all_load # RUN: llvm-nm %t/all-load | FileCheck %s --check-prefix ALL-LOAD # ALL-LOAD: T _bar # ALL-LOAD: T _boo diff --git a/lld/test/MachO/bss.s b/lld/test/MachO/bss.s index e41a7e2..0a036ae 100644 --- a/lld/test/MachO/bss.s +++ b/lld/test/MachO/bss.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-readobj --section-headers --macho-segment %t | FileCheck %s ## Check that __bss takes up zero file size, is at file offset zero, and diff --git a/lld/test/MachO/common-symbol-coalescing.s b/lld/test/MachO/common-symbol-coalescing.s index 88cec56..521602f 100644 --- a/lld/test/MachO/common-symbol-coalescing.s +++ b/lld/test/MachO/common-symbol-coalescing.s @@ -9,26 +9,26 @@ ## Check that we pick the definition with the larger size, regardless of ## its alignment. -# RUN: lld -flavor darwinnew %t/test.o %t/smaller-size.o -order_file %t/order -o %t/test +# RUN: %lld %t/test.o %t/smaller-size.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=SMALLER-ALIGNMENT -# RUN: lld -flavor darwinnew %t/smaller-size.o %t/test.o -order_file %t/order -o %t/test +# RUN: %lld %t/smaller-size.o %t/test.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=SMALLER-ALIGNMENT ## When the sizes are equal, we pick the symbol whose file occurs later in the ## command-line argument list. -# RUN: lld -flavor darwinnew %t/test.o %t/same-size.o -order_file %t/order -o %t/test +# RUN: %lld %t/test.o %t/same-size.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=LARGER-ALIGNMENT -# RUN: lld -flavor darwinnew %t/same-size.o %t/test.o -order_file %t/order -o %t/test +# RUN: %lld %t/same-size.o %t/test.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=SMALLER-ALIGNMENT -# RUN: lld -flavor darwinnew %t/test.o %t/zero-align.o -order_file %t/order -o %t/test +# RUN: %lld %t/test.o %t/zero-align.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=LARGER-ALIGNMENT -# RUN: lld -flavor darwinnew %t/zero-align.o %t/test.o -order_file %t/order -o %t/test +# RUN: %lld %t/zero-align.o %t/test.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=LARGER-ALIGNMENT -# RUN: lld -flavor darwinnew %t/test.o %t/zero-align-round-up.o -order_file %t/order -o %t/test +# RUN: %lld %t/test.o %t/zero-align-round-up.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=LARGER-ALIGNMENT -# RUN: lld -flavor darwinnew %t/zero-align-round-up.o %t/test.o -order_file %t/order -o %t/test +# RUN: %lld %t/zero-align-round-up.o %t/test.o -order_file %t/order -o %t/test # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=LARGER-ALIGNMENT # SMALLER-ALIGNMENT-LABEL: Sections: diff --git a/lld/test/MachO/common-symbol-resolution.s b/lld/test/MachO/common-symbol-resolution.s index 6cefe30..2a88ef5 100644 --- a/lld/test/MachO/common-symbol-resolution.s +++ b/lld/test/MachO/common-symbol-resolution.s @@ -9,7 +9,7 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/calls-foo.s -o %t/calls-foo.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order -dylib %t/libfoo.o -o %t/libfoo.dylib +# RUN: %lld -lSystem -order_file %t/order -dylib %t/libfoo.o -o %t/libfoo.dylib # RUN: rm -f %t/defined.a %t/weak-defined-and-common.a # RUN: llvm-ar rcs %t/defined.a %t/defined.o @@ -20,39 +20,39 @@ ## regardless of whether it is weak. Moreover, the resolved symbol in the output ## file will always be non-weak, even if the winning input symbol definition was ## weak. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/common.o %t/weak-common.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/common.o %t/weak-common.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=LARGER-COMMON -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/weak-common.o %t/common.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/weak-common.o %t/common.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=LARGER-COMMON ## Defined symbols are the only ones that take precedence over common symbols. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/defined.o %t/common.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/defined.o %t/common.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=DEFINED -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/common.o %t/defined.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/common.o %t/defined.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=DEFINED -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/weak-defined.o %t/common.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/weak-defined.o %t/common.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=WEAK-DEFINED -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/common.o %t/weak-defined.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/common.o %t/weak-defined.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=WEAK-DEFINED ## Common symbols take precedence over archive symbols. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/defined.a %t/weak-common.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/defined.a %t/weak-common.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=LARGER-COMMON -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/weak-common.o %t/defined.a %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/weak-common.o %t/defined.a %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=LARGER-COMMON ## If an archive has both a common and a defined symbol, the defined one should ## win. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/weak-defined-and-common.a %t/calls-foo.o -o %t/calls-foo +# RUN: %lld -lSystem -order_file %t/order %t/weak-defined-and-common.a %t/calls-foo.o -o %t/calls-foo # RUN: llvm-objdump --syms %t/calls-foo | FileCheck %s --check-prefix=WEAK-DEFINED -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/calls-foo.o %t/weak-defined-and-common.a -o %t/calls-foo +# RUN: %lld -lSystem -order_file %t/order %t/calls-foo.o %t/weak-defined-and-common.a -o %t/calls-foo # RUN: llvm-objdump --syms %t/calls-foo | FileCheck %s --check-prefix=WEAK-DEFINED ## Common symbols take precedence over dylib symbols. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/libfoo.dylib %t/weak-common.o %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/libfoo.dylib %t/weak-common.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=LARGER-COMMON -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -order_file %t/order %t/weak-common.o %t/libfoo.dylib %t/test.o -o %t/test +# RUN: %lld -lSystem -order_file %t/order %t/weak-common.o %t/libfoo.dylib %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=LARGER-COMMON # LARGER-COMMON-LABEL: SYMBOL TABLE: diff --git a/lld/test/MachO/compact-unwind-pie.s b/lld/test/MachO/compact-unwind-pie.s index 09f7f68..f67cf71 100644 --- a/lld/test/MachO/compact-unwind-pie.s +++ b/lld/test/MachO/compact-unwind-pie.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin19.0.0 %s -o %t.o -# RUN: lld -flavor darwinnew -pie -syslibroot %S/Inputs/MacOSX.sdk -lSystem %t.o -o %t +# RUN: %lld -pie -lSystem %t.o -o %t # RUN: llvm-objdump --macho --unwind-info --rebase %t | FileCheck %s ## Check that we do not add rebase opcodes to the compact unwind section. diff --git a/lld/test/MachO/compact-unwind.test b/lld/test/MachO/compact-unwind.test index e9515c4..42dd918 100644 --- a/lld/test/MachO/compact-unwind.test +++ b/lld/test/MachO/compact-unwind.test @@ -16,6 +16,6 @@ # RUN: %python %S/tools/generate-cfi-funcs.py --seed=johnnyapple >%t.s # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin19.0.0 -o %t.o %t.s -# RUN: lld -flavor darwinnew -Z -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t %t.o +# RUN: %lld -Z -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t %t.o # RUN: llvm-objdump --unwind-info --syms %t %t.o >%t.dump # RUN: %python %S/tools/validate-unwind-info.py %t.dump diff --git a/lld/test/MachO/dso-handle.s b/lld/test/MachO/dso-handle.s index 9cef644..b05c513 100644 --- a/lld/test/MachO/dso-handle.s +++ b/lld/test/MachO/dso-handle.s @@ -1,12 +1,12 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew %t.o -o %t +# RUN: %lld %t.o -o %t # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # CHECK: leaq {{.*}} # 100000000 # CHECK-NEXT: leaq {{.*}} # 100000000 -# RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib +# RUN: %lld -dylib %t.o -o %t.dylib # RUN: llvm-objdump -d --no-show-raw-insn %t.dylib | FileCheck %s --check-prefix=DYLIB-CHECK # DYLIB-CHECK: leaq {{.*}} # 0 # DYLIB-CHECK-NEXT: leaq {{.*}} # 0 diff --git a/lld/test/MachO/dylib.s b/lld/test/MachO/dylib.s index 507a7de..d976b9e 100644 --- a/lld/test/MachO/dylib.s +++ b/lld/test/MachO/dylib.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libfoo.dylib \ +# RUN: %lld -dylib -install_name @executable_path/libfoo.dylib \ # RUN: %t.o -o %t.dylib # RUN: llvm-objdump --macho --dylib-id %t.dylib | FileCheck %s # CHECK: @executable_path/libfoo.dylib @@ -10,7 +10,7 @@ ## a flag for a missing entry symbol (since dylibs don't have entry symbols). ## Also check that we come up with the right install name if one isn't ## specified. -# RUN: lld -flavor darwinnew -dylib %t.o -o %t.defaultInstallName.dylib -e missing_entry +# RUN: %lld -dylib %t.o -o %t.defaultInstallName.dylib -e missing_entry # RUN: obj2yaml %t.defaultInstallName.dylib | FileCheck %s -DOUTPUT=%t.defaultInstallName.dylib --check-prefix=DEFAULT-INSTALL-NAME # DEFAULT-INSTALL-NAME: [[OUTPUT]] diff --git a/lld/test/MachO/dylink-lazy.s b/lld/test/MachO/dylink-lazy.s index 6b10d9c..8e3e0b6 100644 --- a/lld/test/MachO/dylink-lazy.s +++ b/lld/test/MachO/dylink-lazy.s @@ -4,16 +4,16 @@ # 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 -flavor darwinnew -dylib -L%S/Inputs/MacOSX.sdk/usr/lib \ +# RUN: %lld -dylib \ # RUN: -install_name @executable_path/libhello.dylib %t/libhello.o \ # RUN: -o %t/libhello.dylib -# RUN: lld -flavor darwinnew -dylib -L%S/Inputs/MacOSX.sdk/usr/lib \ +# 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 -flavor darwinnew -o %t/dylink-lazy \ -# RUN: -L%S/Inputs/MacOSX.sdk/usr/lib -L%t -lhello -lgoodbye %t/dylink-lazy.o -lSystem +# RUN: %lld -o %t/dylink-lazy \ +# 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 @@ -22,8 +22,8 @@ # RUN: (llvm-objdump -d --no-show-raw-insn --syms --rebase --bind --lazy-bind %t/dylink-lazy; \ # RUN: llvm-objdump -D --no-show-raw-insn %t/dylink-lazy) | FileCheck %s -# RUN: lld -flavor darwinnew -pie -o %t/dylink-lazy-pie \ -# RUN: -L%S/Inputs/MacOSX.sdk/usr/lib -L%t -lhello -lgoodbye %t/dylink-lazy.o -lSystem +# 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 # CHECK-LABEL: SYMBOL TABLE: diff --git a/lld/test/MachO/dylink.s b/lld/test/MachO/dylink.s index 0549aab..99d4ef8 100644 --- a/lld/test/MachO/dylink.s +++ b/lld/test/MachO/dylink.s @@ -4,9 +4,9 @@ # 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 -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libhello.dylib %t/libhello.o -o %t/libhello.dylib -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libgoodbye.dylib %t/libgoodbye.o -o %t/libgoodbye.dylib ## Make sure we are using the export trie and not the symbol table when linking @@ -18,7 +18,7 @@ # NOSYM: no symbols # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/dylink.o -# RUN: lld -flavor darwinnew -o %t/dylink -Z -L%t -lhello -lgoodbye %t/dylink.o +# RUN: %lld -o %t/dylink -L%t -lhello -lgoodbye %t/dylink.o # RUN: llvm-objdump --bind -d --no-show-raw-insn %t/dylink | FileCheck %s # CHECK: movq [[#%u, HELLO_OFF:]](%rip), %rsi diff --git a/lld/test/MachO/entry-symbol.s b/lld/test/MachO/entry-symbol.s index d24d4e6..142eae1 100644 --- a/lld/test/MachO/entry-symbol.s +++ b/lld/test/MachO/entry-symbol.s @@ -2,9 +2,9 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/not-main.s -o %t/not-main.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -dylib %t/libfoo.o -o %t/libfoo.dylib +# RUN: %lld -lSystem -dylib %t/libfoo.o -o %t/libfoo.dylib -# RUN: lld -flavor darwinnew -o %t/not-main %t/not-main.o -e _not_main +# RUN: %lld -o %t/not-main %t/not-main.o -e _not_main # RUN: llvm-objdump --macho --all-headers --syms %t/not-main | FileCheck %s # CHECK-LABEL: SYMBOL TABLE # CHECK-NEXT: {{0*}}[[#%x, ENTRY_ADDR:]] {{.*}} __TEXT,__text _not_main @@ -19,7 +19,7 @@ # CHECK-NEXT: size # CHECK-NEXT: offset [[#ENTRYOFF]] -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -o %t/dysym-main %t/not-main.o %t/libfoo.dylib -e _dysym_main +# RUN: %lld -lSystem -o %t/dysym-main %t/not-main.o %t/libfoo.dylib -e _dysym_main # RUN: llvm-objdump --macho --all-headers --indirect-symbols --lazy-bind %t/dysym-main | FileCheck %s --check-prefix=DYSYM # DYSYM-LABEL: Indirect symbols for (__TEXT,__stubs) 1 entries # DYSYM-NEXT: address index name @@ -31,7 +31,7 @@ # DYSYM-NEXT: segment section address dylib symbol # DYSYM-NEXT: __DATA __la_symbol_ptr {{.*}} libfoo _dysym_main -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -o %t/weak-dysym-main %t/not-main.o %t/libfoo.dylib -e _weak_dysym_main +# RUN: %lld -lSystem -o %t/weak-dysym-main %t/not-main.o %t/libfoo.dylib -e _weak_dysym_main # RUN: llvm-objdump --macho --all-headers --indirect-symbols --bind --weak-bind %t/weak-dysym-main | FileCheck %s --check-prefix=WEAK-DYSYM # WEAK-DYSYM-LABEL: Indirect symbols for (__TEXT,__stubs) 1 entries # WEAK-DYSYM-NEXT: address index name @@ -46,9 +46,9 @@ # WEAK-DYSYM-NEXT: segment section address type addend symbol # WEAK-DYSYM-NEXT: __DATA __la_symbol_ptr {{.*}} pointer 0 _weak_dysym_main -# RUN: not lld -flavor darwinnew -o /dev/null %t/not-main.o -e _missing 2>&1 | FileCheck %s --check-prefix=UNDEFINED +# RUN: not %lld -o /dev/null %t/not-main.o -e _missing 2>&1 | FileCheck %s --check-prefix=UNDEFINED # UNDEFINED: error: undefined symbol: _missing -# RUN: not lld -flavor darwinnew -o /dev/null %t/not-main.o 2>&1 | FileCheck %s --check-prefix=DEFAULT-ENTRY +# RUN: not %lld -o /dev/null %t/not-main.o 2>&1 | FileCheck %s --check-prefix=DEFAULT-ENTRY # DEFAULT-ENTRY: error: undefined symbol: _main #--- libfoo.s diff --git a/lld/test/MachO/export-trie.s b/lld/test/MachO/export-trie.s index 7f628c5..c479e16 100644 --- a/lld/test/MachO/export-trie.s +++ b/lld/test/MachO/export-trie.s @@ -6,7 +6,7 @@ ## the image base starts at a non-zero address. This allows us to verify that ## addresses in the export trie are correctly encoded as relative to the image ## base. -# RUN: lld -flavor darwinnew %t.o -o %t +# RUN: %lld %t.o -o %t # RUN: llvm-objdump --syms --exports-trie %t | FileCheck %s --check-prefix=EXPORTS # EXPORTS-LABEL: SYMBOL TABLE: diff --git a/lld/test/MachO/fat-arch.s b/lld/test/MachO/fat-arch.s index cb5a74b..33928b1 100644 --- a/lld/test/MachO/fat-arch.s +++ b/lld/test/MachO/fat-arch.s @@ -2,10 +2,10 @@ # RUN: llvm-mc -filetype=obj -triple=i386-apple-darwin %s -o %t.i386.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.x86_64.o # RUN: llvm-lipo %t.i386.o %t.x86_64.o -create -o %t.fat.o -# RUN: lld -flavor darwinnew -o /dev/null %t.fat.o +# RUN: %lld -o /dev/null %t.fat.o # RUN: llvm-lipo %t.i386.o -create -o %t.noarch.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.noarch.o 2>&1 | \ +# RUN: not %lld -o /dev/null %t.noarch.o 2>&1 | \ # RUN: FileCheck %s -DFILE=%t.noarch.o # CHECK: error: unable to find matching architecture in [[FILE]] diff --git a/lld/test/MachO/filelist.s b/lld/test/MachO/filelist.s index 673740e..32be332 100644 --- a/lld/test/MachO/filelist.s +++ b/lld/test/MachO/filelist.s @@ -13,25 +13,25 @@ # RUN: echo "%t/first.o" > filelist # RUN: echo "%t/second.o" >> filelist -# RUN: lld -flavor darwinnew -Z -filelist filelist %t/test.o -o %t/test +# RUN: %lld -filelist filelist %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=FIRST # RUN: echo "%t/second.o" > filelist # RUN: echo "%t/first.o" >> filelist -# RUN: lld -flavor darwinnew -Z -filelist filelist %t/test.o -o %t/test +# RUN: %lld -filelist filelist %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=SECOND # RUN: echo "%t/first.o" > filelist -# RUN: lld -flavor darwinnew -Z -filelist filelist %t/second.o %t/test.o -o %t/test +# RUN: %lld -filelist filelist %t/second.o %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=FIRST -# RUN: lld -flavor darwinnew -Z %t/second.o -filelist filelist %t/test.o -o %t/test +# RUN: %lld %t/second.o -filelist filelist %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=SECOND # RUN: echo "%t/first.o" > filelist-1 # RUN: echo "%t/second.o" > filelist-2 -# RUN: lld -flavor darwinnew -Z -filelist filelist-1 -filelist filelist-2 %t/test.o -o %t/test +# RUN: %lld -filelist filelist-1 -filelist filelist-2 %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=FIRST -# RUN: lld -flavor darwinnew -Z -filelist filelist-2 -filelist filelist-1 %t/test.o -o %t/test +# RUN: %lld -filelist filelist-2 -filelist filelist-1 %t/test.o -o %t/test # RUN: llvm-objdump --syms %t/test | FileCheck %s --check-prefix=SECOND .globl _main diff --git a/lld/test/MachO/force-load.s b/lld/test/MachO/force-load.s index 0c09094..ffc2019 100644 --- a/lld/test/MachO/force-load.s +++ b/lld/test/MachO/force-load.s @@ -6,11 +6,11 @@ # RUN: echo ".section __TEXT,obj; .globl _foo; .weak_definition _foo; _foo:" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/foo.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -force_load %t/foo.a %t/foo.o %t/test.o -o %t/test-force-load-first +# RUN: %lld -force_load %t/foo.a %t/foo.o %t/test.o -o %t/test-force-load-first # FORCE-LOAD-FIRST: __TEXT,archive _foo # RUN: llvm-objdump --syms %t/test-force-load-first | FileCheck %s --check-prefix=FORCE-LOAD-FIRST -# RUN: lld -flavor darwinnew %t/foo.o -force_load %t/foo.a %t/test.o -o %t/test-force-load-second +# RUN: %lld %t/foo.o -force_load %t/foo.a %t/test.o -o %t/test-force-load-second # RUN: llvm-objdump --syms %t/test-force-load-second | FileCheck %s --check-prefix=FORCE-LOAD-SECOND # FORCE-LOAD-SECOND: __TEXT,obj _foo diff --git a/lld/test/MachO/framework.s b/lld/test/MachO/framework.s index f60a63c8..43e1ec4 100644 --- a/lld/test/MachO/framework.s +++ b/lld/test/MachO/framework.s @@ -2,20 +2,20 @@ # RUN: mkdir -p %t # RUN: echo ".globl _foo; _foo: ret" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/foo.o # RUN: mkdir -p %t/Foo.framework/Versions/A -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -dylib -install_name %t/Foo.framework/Versions/A/Foo %t/foo.o -o %t/Foo.framework/Versions/A/Foo -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -dylib -install_name %t/Foo.framework/Versions/A/Foobar %t/foo.o -o %t/Foo.framework/Versions/A/Foobar +# RUN: %lld -dylib -install_name %t/Foo.framework/Versions/A/Foo %t/foo.o -o %t/Foo.framework/Versions/A/Foo +# RUN: %lld -dylib -install_name %t/Foo.framework/Versions/A/Foobar %t/foo.o -o %t/Foo.framework/Versions/A/Foobar # RUN: ln -sf %t/Foo.framework/Versions/A %t/Foo.framework/Versions/Current # RUN: ln -sf %t/Foo.framework/Versions/Current/Foo %t/Foo.framework/Foo # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/test.o %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -F%t -framework Foo %t/test.o -o %t/test +# RUN: %lld -lSystem -F%t -framework Foo %t/test.o -o %t/test # RUN: llvm-objdump --macho --lazy-bind %t/test | FileCheck %s --check-prefix=NOSUFFIX # NOSUFFIX: __DATA __la_symbol_ptr 0x{{[0-9a-f]*}} {{.*}}Foo _foo -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -F%t -framework Foo,baz %t/test.o -o %t/test-wrong-suffix +# RUN: %lld -lSystem -F%t -framework Foo,baz %t/test.o -o %t/test-wrong-suffix # RUN: llvm-objdump --macho --lazy-bind %t/test-wrong-suffix | FileCheck %s --check-prefix=NOSUFFIX -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -F%t -framework Foo,bar %t/test.o -o %t/test-suffix +# RUN: %lld -lSystem -F%t -framework Foo,bar %t/test.o -o %t/test-suffix # RUN: llvm-objdump --macho --lazy-bind %t/test-suffix | FileCheck %s --check-prefix=SUFFIX # SUFFIX: __DATA __la_symbol_ptr 0x{{[0-9a-f]*}} {{.*}}Foobar _foo diff --git a/lld/test/MachO/headerpad.s b/lld/test/MachO/headerpad.s index c069f1d..7abc7f2 100644 --- a/lld/test/MachO/headerpad.s +++ b/lld/test/MachO/headerpad.s @@ -10,7 +10,7 @@ ################ Check default behavior # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s --check-prefix=PADx # # PADx: magic {{.+}} ncmds sizeofcmds flags @@ -22,9 +22,9 @@ # PADx-NEXT: offset [[#%u, CMDSIZE + 0x20 + 0x20]] ################ Zero pad, no LCDylibs -# RUN: lld -flavor darwinnew -o %t %t.o -headerpad 0 +# RUN: %lld -o %t %t.o -headerpad 0 # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s --check-prefix=PAD0 -# RUN: lld -flavor darwinnew -o %t %t.o -headerpad 0 -headerpad_max_install_names +# RUN: %lld -o %t %t.o -headerpad 0 -headerpad_max_install_names # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s --check-prefix=PAD0 # # PAD0: magic {{.+}} ncmds sizeofcmds flags @@ -36,11 +36,11 @@ # PAD0-NEXT: offset [[#%u, CMDSIZE + 0x20 + 0]] ################ Each lexical form of a hex number, no LCDylibs -# RUN: lld -flavor darwinnew -o %t %t.o -headerpad 11 +# RUN: %lld -o %t %t.o -headerpad 11 # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s --check-prefix=PAD11 -# RUN: lld -flavor darwinnew -o %t %t.o -headerpad 0x11 +# RUN: %lld -o %t %t.o -headerpad 0x11 # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s --check-prefix=PAD11 -# RUN: lld -flavor darwinnew -o %t %t.o -headerpad 0X11 -headerpad_max_install_names +# RUN: %lld -o %t %t.o -headerpad 0X11 -headerpad_max_install_names # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s --check-prefix=PAD11 # # PAD11: magic {{.+}} ncmds sizeofcmds flags @@ -53,16 +53,15 @@ ################ Each & all 3 kinds of LCDylib # RUN: echo "" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %T/null.o -# RUN: lld -flavor darwinnew -o %T/libnull.dylib %T/null.o -dylib \ +# RUN: %lld -o %T/libnull.dylib %T/null.o -dylib \ # RUN: -headerpad_max_install_names # RUN: llvm-objdump --macho --all-headers %T/libnull.dylib | FileCheck %s --check-prefix=PADMAX -# RUN: lld -flavor darwinnew -o %T/libnull.dylib %T/null.o -dylib \ -# RUN: -headerpad_max_install_names \ -# RUN: -syslibroot %S/Inputs/MacOSX.sdk -lSystem +# RUN: %lld -o %T/libnull.dylib %T/null.o -dylib \ +# RUN: -headerpad_max_install_names -lSystem # RUN: llvm-objdump --macho --all-headers %T/libnull.dylib | FileCheck %s --check-prefix=PADMAX -# RUN: lld -flavor darwinnew -o %T/libnull.dylib %T/null.o -dylib \ +# RUN: %lld -o %T/libnull.dylib %T/null.o -dylib \ # RUN: -headerpad_max_install_names \ -# RUN: -syslibroot %S/Inputs/MacOSX.sdk -lSystem -sub_library libSystem +# RUN: -lSystem -sub_library libSystem # RUN: llvm-objdump --macho --all-headers %T/libnull.dylib | FileCheck %s --check-prefix=PADMAX # # PADMAX: magic {{.+}} ncmds sizeofcmds flags @@ -74,9 +73,9 @@ # PADMAX-NEXT: offset [[#%u, CMDSIZE + 0x20 + mul(0x400, N - 6)]] ################ All 3 kinds of LCDylib swamped by a larger override -# RUN: lld -flavor darwinnew -o %T/libnull.dylib %T/null.o -dylib \ +# RUN: %lld -o %T/libnull.dylib %T/null.o -dylib \ # RUN: -headerpad_max_install_names -headerpad 0x1001 \ -# RUN: -syslibroot %S/Inputs/MacOSX.sdk -lSystem -sub_library libSystem +# RUN: -lSystem -sub_library libSystem # RUN: llvm-objdump --macho --all-headers %T/libnull.dylib | FileCheck %s --check-prefix=PADOVR # # PADOVR: magic {{.+}} ncmds sizeofcmds flags diff --git a/lld/test/MachO/indirect-symtab.s b/lld/test/MachO/indirect-symtab.s index 515fd34..53c3d5d 100644 --- a/lld/test/MachO/indirect-symtab.s +++ b/lld/test/MachO/indirect-symtab.s @@ -2,8 +2,8 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o -# RUN: lld -flavor darwinnew -dylib %t/libfoo.o -o %t/libfoo.dylib -syslibroot %S/Inputs/MacOSX.sdk -lSystem -# RUN: lld -flavor darwinnew %t/test.o %t/libfoo.dylib -o %t/test -syslibroot %S/Inputs/MacOSX.sdk -lSystem +# RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib -lSystem +# RUN: %lld %t/test.o %t/libfoo.dylib -o %t/test -lSystem # RUN: llvm-objdump --macho -d --no-show-raw-insn --indirect-symbols %t/test | FileCheck %s # CHECK: (__TEXT,__text) section diff --git a/lld/test/MachO/invalid/abs-duplicate.s b/lld/test/MachO/invalid/abs-duplicate.s index e46c783..ba0bbdb 100644 --- a/lld/test/MachO/invalid/abs-duplicate.s +++ b/lld/test/MachO/invalid/abs-duplicate.s @@ -2,7 +2,7 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weakfoo.s -o %t/weakfoo.o -# RUN: not lld -flavor darwinnew -syslibroot %S/../Inputs/MacOSX.sdk -lSystem %t/test.o %t/weakfoo.o -o %t/test 2>&1 | FileCheck %s +# RUN: not %lld -lSystem %t/test.o %t/weakfoo.o -o %t/test 2>&1 | FileCheck %s # CHECK: lld: error: duplicate symbol: _weakfoo diff --git a/lld/test/MachO/invalid/alignment-too-large.yaml b/lld/test/MachO/invalid/alignment-too-large.yaml index 7995052..8abe2ef 100644 --- a/lld/test/MachO/invalid/alignment-too-large.yaml +++ b/lld/test/MachO/invalid/alignment-too-large.yaml @@ -1,5 +1,5 @@ # RUN: yaml2obj %s -o %t.o -# RUN: not lld -flavor darwinnew -o %t %t.o 2>&1 | FileCheck %s +# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s # # CHECK: error: alignment 32 of section __text is too large --- !mach-o diff --git a/lld/test/MachO/invalid/archive-no-index.s b/lld/test/MachO/invalid/archive-no-index.s index 0f2f023..d4d2afb 100644 --- a/lld/test/MachO/invalid/archive-no-index.s +++ b/lld/test/MachO/invalid/archive-no-index.s @@ -8,7 +8,7 @@ # RUN: rm -f %t/test.a # RUN: llvm-ar rcS %t/test.a %t/2.o %t/3.o %t/4.o -# RUN: not lld -flavor darwinnew %t/test.o %t/test.a -o /dev/null 2>&1 | FileCheck %s +# RUN: not %lld %t/test.o %t/test.a -o /dev/null 2>&1 | FileCheck %s # CHECK: error: {{.*}}.a: archive has no index; run ranlib to add one .global _main diff --git a/lld/test/MachO/invalid/bad-archive.s b/lld/test/MachO/invalid/bad-archive.s index b341fb4..b00ff61 100644 --- a/lld/test/MachO/invalid/bad-archive.s +++ b/lld/test/MachO/invalid/bad-archive.s @@ -3,8 +3,8 @@ # RUN: echo "foo" >> %t.a # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew %t.o %t.a -o /dev/null 2>&1 | FileCheck -DFILE=%t.a %s -# RUN: not lld -flavor darwinnew %t.o -force_load %t.a -o /dev/null 2>&1 | FileCheck -DFILE=%t.a %s +# RUN: not %lld %t.o %t.a -o /dev/null 2>&1 | FileCheck -DFILE=%t.a %s +# RUN: not %lld %t.o -force_load %t.a -o /dev/null 2>&1 | FileCheck -DFILE=%t.a %s # CHECK: error: [[FILE]]: failed to parse archive: truncated or malformed archive (remaining size of archive too small for next archive member header at offset 8) .global _main diff --git a/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s b/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s index c1c817c..4a0be85 100644 --- a/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s +++ b/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s @@ -2,11 +2,11 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libtlv.s -o %t/libtlv.o -# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libtlv.dylib \ -# RUN: -Z -L%S/../Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/libtlv.dylib %t/libtlv.o +# RUN: %lld -dylib -install_name @executable_path/libtlv.dylib \ +# RUN: -lSystem -o %t/libtlv.dylib %t/libtlv.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o -# RUN: not lld -flavor darwinnew -Z -L%S/../Inputs/MacOSX.sdk/usr/lib -lSystem -L%t -ltlv -o /dev/null %t/test.o 2>&1 | FileCheck %s -DFILE=%t/test.o +# RUN: not %lld -lSystem -L%t -ltlv -o /dev/null %t/test.o 2>&1 | FileCheck %s -DFILE=%t/test.o # CHECK: error: found GOT relocation referencing thread-local variable in [[FILE]]:(__text) diff --git a/lld/test/MachO/invalid/bad-got-to-tlv-reference.s b/lld/test/MachO/invalid/bad-got-to-tlv-reference.s index 916182f..b992379 100644 --- a/lld/test/MachO/invalid/bad-got-to-tlv-reference.s +++ b/lld/test/MachO/invalid/bad-got-to-tlv-reference.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | FileCheck %s -DFILE=%t.o +# RUN: not %lld -o /dev/null %t.o 2>&1 | FileCheck %s -DFILE=%t.o # CHECK: error: found GOT relocation referencing thread-local variable in [[FILE]]:(__text) diff --git a/lld/test/MachO/invalid/bad-tlv-def.s b/lld/test/MachO/invalid/bad-tlv-def.s index 8ba2485..a1ef011 100644 --- a/lld/test/MachO/invalid/bad-tlv-def.s +++ b/lld/test/MachO/invalid/bad-tlv-def.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | FileCheck %s +# RUN: not %lld -o /dev/null %t.o 2>&1 | FileCheck %s # CHECK: error: relocations in thread-local variable sections must be X86_64_RELOC_UNSIGNED diff --git a/lld/test/MachO/invalid/bad-tlv-opcode.s b/lld/test/MachO/invalid/bad-tlv-opcode.s index 4c0ad03..c881a97 100644 --- a/lld/test/MachO/invalid/bad-tlv-opcode.s +++ b/lld/test/MachO/invalid/bad-tlv-opcode.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | FileCheck %s +# RUN: not %lld -o /dev/null %t.o 2>&1 | FileCheck %s # CHECK: error: X86_64_RELOC_TLV must be used with movq instructions diff --git a/lld/test/MachO/invalid/bad-tlv-relocation.s b/lld/test/MachO/invalid/bad-tlv-relocation.s index 586f180..f6c857b 100644 --- a/lld/test/MachO/invalid/bad-tlv-relocation.s +++ b/lld/test/MachO/invalid/bad-tlv-relocation.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | FileCheck %s -DFILE=%t.o +# RUN: not %lld -o /dev/null %t.o 2>&1 | FileCheck %s -DFILE=%t.o # CHECK: error: found X86_64_RELOC_TLV referencing a non-thread-local variable in [[FILE]]:(__text) diff --git a/lld/test/MachO/invalid/dso-handle-duplicate.s b/lld/test/MachO/invalid/dso-handle-duplicate.s index 4390da6..5f64dc1 100644 --- a/lld/test/MachO/invalid/dso-handle-duplicate.s +++ b/lld/test/MachO/invalid/dso-handle-duplicate.s @@ -7,7 +7,7 @@ ## far-out edge case that should be safe to ignore. # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -dylib %t.o -o %t.dylib 2>&1 | FileCheck %s +# RUN: not %lld -dylib %t.o -o %t.dylib 2>&1 | FileCheck %s # CHECK: error: found defined symbol with illegal name ___dso_handle .globl _main, ___dso_handle diff --git a/lld/test/MachO/invalid/duplicate-symbol.s b/lld/test/MachO/invalid/duplicate-symbol.s index d08f34f..ce662b6 100644 --- a/lld/test/MachO/invalid/duplicate-symbol.s +++ b/lld/test/MachO/invalid/duplicate-symbol.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t-dup.o -# RUN: not lld -flavor darwinnew -o /dev/null %t-dup.o %t.o 2>&1 | FileCheck %s +# RUN: not %lld -o /dev/null %t-dup.o %t.o 2>&1 | FileCheck %s # CHECK: error: duplicate symbol: _main diff --git a/lld/test/MachO/invalid/invalid-executable.s b/lld/test/MachO/invalid/invalid-executable.s index d8d7acc..a773b04 100644 --- a/lld/test/MachO/invalid/invalid-executable.s +++ b/lld/test/MachO/invalid/invalid-executable.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t 2>&1 | FileCheck %s -DFILE=%t +# RUN: %lld -o %t %t.o +# RUN: not %lld -o /dev/null %t 2>&1 | FileCheck %s -DFILE=%t # CHECK: error: [[FILE]]: unhandled file type .text diff --git a/lld/test/MachO/invalid/invalid-fat-narch.s b/lld/test/MachO/invalid/invalid-fat-narch.s index 2b74893..ca298dd 100644 --- a/lld/test/MachO/invalid/invalid-fat-narch.s +++ b/lld/test/MachO/invalid/invalid-fat-narch.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: yaml2obj %s -o %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | \ +# RUN: not %lld -o /dev/null %t.o 2>&1 | \ # RUN: FileCheck %s -DFILE=%t.o # CHECK: error: [[FILE]]: fat_arch struct extends beyond end of file diff --git a/lld/test/MachO/invalid/invalid-fat-offset.s b/lld/test/MachO/invalid/invalid-fat-offset.s index fed9790..3ad8a67 100644 --- a/lld/test/MachO/invalid/invalid-fat-offset.s +++ b/lld/test/MachO/invalid/invalid-fat-offset.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: yaml2obj %s -o %t.o -# RUN: not lld -flavor darwinnew -o /dev/null %t.o 2>&1 | \ +# RUN: not %lld -o /dev/null %t.o 2>&1 | \ # RUN: FileCheck %s -DFILE=%t.o # CHECK: error: [[FILE]]: slice extends beyond end of file diff --git a/lld/test/MachO/invalid/invalid-relocation-length.yaml b/lld/test/MachO/invalid/invalid-relocation-length.yaml index e256c4f..e8cfbec 100644 --- a/lld/test/MachO/invalid/invalid-relocation-length.yaml +++ b/lld/test/MachO/invalid/invalid-relocation-length.yaml @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: yaml2obj %s -o %t.o -# RUN: not lld -flavor darwinnew -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o +# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o # # CHECK: error: invalid relocation at offset 1 of __TEXT,__text in [[FILE]]: relocations of type 0 must have r_length of 2 or 3 diff --git a/lld/test/MachO/invalid/invalid-relocation-pcrel.yaml b/lld/test/MachO/invalid/invalid-relocation-pcrel.yaml index ed7c24ea..3fa2f1f 100644 --- a/lld/test/MachO/invalid/invalid-relocation-pcrel.yaml +++ b/lld/test/MachO/invalid/invalid-relocation-pcrel.yaml @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: yaml2obj %s -o %t.o -# RUN: not lld -flavor darwinnew -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o +# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o # # CHECK: error: invalid relocation at offset 1 of __TEXT,__text in [[FILE]]: relocations of type 0 must not be pcrel diff --git a/lld/test/MachO/invalid/invalid-stub.s b/lld/test/MachO/invalid/invalid-stub.s index dd3fc65..546c91a 100644 --- a/lld/test/MachO/invalid/invalid-stub.s +++ b/lld/test/MachO/invalid/invalid-stub.s @@ -3,7 +3,7 @@ # RUN: echo "--- !tapi-tbd-v3" > %t/libinvalidYAML.tbd # RUN: echo "invalid YAML" >> %t/libinvalidYAML.tbd # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o -# RUN: not lld -flavor darwinnew -Z -L%t -linvalidYAML %t/test.o -o %t/test -Z 2>&1 | FileCheck %s -DDIR=%t +# RUN: not %lld -L%t -linvalidYAML %t/test.o -o %t/test 2>&1 | FileCheck %s -DDIR=%t # CHECK: could not load TAPI file at [[DIR]]{{[\\/]}}libinvalidYAML.tbd: malformed file diff --git a/lld/test/MachO/invalid/missing-dylib.s b/lld/test/MachO/invalid/missing-dylib.s index ad7e511..38fbe7e 100644 --- a/lld/test/MachO/invalid/missing-dylib.s +++ b/lld/test/MachO/invalid/missing-dylib.s @@ -1,5 +1,5 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -Z -o %t -lmissing %t.o 2>&1 | FileCheck %s +# RUN: not %lld -o %t -lmissing %t.o 2>&1 | FileCheck %s # CHECK: error: library not found for -lmissing diff --git a/lld/test/MachO/invalid/no-filelist.s b/lld/test/MachO/invalid/no-filelist.s index 980814c..47e8f33 100644 --- a/lld/test/MachO/invalid/no-filelist.s +++ b/lld/test/MachO/invalid/no-filelist.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -Z -filelist nonexistent %t.o -o %t 2>&1 | FileCheck %s +# RUN: not %lld -filelist nonexistent %t.o -o %t 2>&1 | FileCheck %s # CHECK: cannot open nonexistent: {{N|n}}o such file or directory .globl _main diff --git a/lld/test/MachO/invalid/no-id-dylink.yaml b/lld/test/MachO/invalid/no-id-dylink.yaml index d5b0b33..cc8b2f6 100644 --- a/lld/test/MachO/invalid/no-id-dylink.yaml +++ b/lld/test/MachO/invalid/no-id-dylink.yaml @@ -2,7 +2,7 @@ # RUN: mkdir -p %t # RUN: yaml2obj %s -o %t/libnoid.dylib # RUN: echo ".globl _main; .text; _main: ret" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/no-id-dylink.o -# RUN: not lld -flavor darwinnew -o %t/no-id-dylink -Z -L%t -lnoid %t/no-id-dylink.o 2>&1 | FileCheck %s +# RUN: not %lld -o %t/no-id-dylink -L%t -lnoid %t/no-id-dylink.o 2>&1 | FileCheck %s # CHECK: error: dylib {{.*}}libnoid.dylib missing LC_ID_DYLIB load command ## This YAML file was originally generated from linking the following source diff --git a/lld/test/MachO/invalid/no-such-file.s b/lld/test/MachO/invalid/no-such-file.s index 0122c61..80f15297 100644 --- a/lld/test/MachO/invalid/no-such-file.s +++ b/lld/test/MachO/invalid/no-such-file.s @@ -1,4 +1,4 @@ # REQUIRES: x86 -# RUN: not lld -flavor darwinnew -o /dev/null %t-no-such-file.o 2>&1 | FileCheck %s +# RUN: not %lld -o /dev/null %t-no-such-file.o 2>&1 | FileCheck %s # CHECK: error: cannot open {{.*}}no-such-file.o diff --git a/lld/test/MachO/invalid/order-file-bad-arch.test b/lld/test/MachO/invalid/order-file-bad-arch.test index 84fe696..06b37b0 100644 --- a/lld/test/MachO/invalid/order-file-bad-arch.test +++ b/lld/test/MachO/invalid/order-file-bad-arch.test @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: echo ".globl _main; .text; _main: ret" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t.o -# RUN: not lld -flavor darwinnew -o %t %t.o -order_file %s 2>&1 | FileCheck %s +# RUN: not %lld -o %t %t.o -order_file %s 2>&1 | FileCheck %s # CHECK: error: invalid arch "sparc" in order file: expected one of arm, arm64, i386, x86_64, ppc, ppc64 # CHECK-EMPTY: diff --git a/lld/test/MachO/invalid/order-file-bad-objfile.test b/lld/test/MachO/invalid/order-file-bad-objfile.test index 19e9404..546e688 100644 --- a/lld/test/MachO/invalid/order-file-bad-objfile.test +++ b/lld/test/MachO/invalid/order-file-bad-objfile.test @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: echo ".globl _main; .text; _main: ret" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t.o -# RUN: not lld -flavor darwinnew -o %t %t.o -order_file %s 2>&1 | FileCheck %s +# RUN: not %lld -o %t %t.o -order_file %s 2>&1 | FileCheck %s # CHECK: invalid object file name "helloo" in order file: should end with .o # CHECK: invalid object file name "z80" in order file: should end with .o # CHECK-EMPTY: diff --git a/lld/test/MachO/invalid/reserved-section-name.s b/lld/test/MachO/invalid/reserved-section-name.s index 8d767bc..2ef5127 100644 --- a/lld/test/MachO/invalid/reserved-section-name.s +++ b/lld/test/MachO/invalid/reserved-section-name.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o +# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s -DFILE=%t.o # CHECK: error: section from [[FILE]] conflicts with synthetic section __DATA_CONST,__got .globl _main diff --git a/lld/test/MachO/invalid/stub-link.s b/lld/test/MachO/invalid/stub-link.s index bcbdea1..fe7f0e15 100644 --- a/lld/test/MachO/invalid/stub-link.s +++ b/lld/test/MachO/invalid/stub-link.s @@ -6,7 +6,7 @@ # RUN: mkdir -p %t # # RUN: llvm-mc -filetype obj -triple x86_64-apple-ios %s -o %t/test.o -# RUN: not lld -flavor darwinnew -o %t/test -Z -L%S/../Inputs/iPhoneSimulator.sdk/usr/lib -lSystem %t/test.o 2>&1 | FileCheck %s +# RUN: not lld -flavor darwinnew -o %t/test -syslibroot %S/../Inputs/iPhoneSimulator.sdk -lSystem %t/test.o 2>&1 | FileCheck %s # CHECK-DAG: error: undefined symbol __cache_handle_memory_pressure_event # CHECK-DAG: error: undefined symbol _from_non_reexported_tapi_dylib diff --git a/lld/test/MachO/invalid/undefined-symbol.s b/lld/test/MachO/invalid/undefined-symbol.s index 88eabfd..2a981bb 100644 --- a/lld/test/MachO/invalid/undefined-symbol.s +++ b/lld/test/MachO/invalid/undefined-symbol.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 | FileCheck %s -DBASENAME=%basename_t +# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s -DBASENAME=%basename_t # CHECK: error: undefined symbol _foo, referenced from [[BASENAME]] .globl _main diff --git a/lld/test/MachO/lc-build-version.s b/lld/test/MachO/lc-build-version.s index c1b93b9..efffe57 100644 --- a/lld/test/MachO/lc-build-version.s +++ b/lld/test/MachO/lc-build-version.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -Z -platform_version macos 10.14.1 10.15 -o %t %t.o +# RUN: %lld -platform_version macos 10.14.1 10.15 -o %t %t.o # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s # CHECK: cmd LC_BUILD_VERSION diff --git a/lld/test/MachO/link-search-order.s b/lld/test/MachO/link-search-order.s index 26c8888..a2ce1fa 100644 --- a/lld/test/MachO/link-search-order.s +++ b/lld/test/MachO/link-search-order.s @@ -5,44 +5,44 @@ # RUN: mkdir -p %t %tA %tD # # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %p/Inputs/libhello.s -o %t/hello.o -# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libhello.dylib %t/hello.o -o %t/libhello.dylib +# RUN: %lld -dylib -install_name @executable_path/libhello.dylib %t/hello.o -o %t/libhello.dylib # # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %p/Inputs/libgoodbye.s -o %t/goodbye.o -# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libgoodbye.dylib %t/goodbye.o -o %tD/libgoodbye.dylib +# RUN: %lld -dylib -install_name @executable_path/libgoodbye.dylib %t/goodbye.o -o %tD/libgoodbye.dylib # RUN: llvm-ar --format=darwin crs %tA/libgoodbye.a %t/goodbye.o # # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o ################ default, which is the same as -search_paths_first -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tA -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s ################ Test all permutations of -L%t{A,D} with -search_paths_first -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tA -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tD -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s ################ Test all permutations of -L%t{A,D} with -search_dylibs_first -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tA -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tD -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ +# RUN: %lld -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \ # RUN: -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s diff --git a/lld/test/MachO/linkedit-contiguity.s b/lld/test/MachO/linkedit-contiguity.s index f815e55..8e4debb 100644 --- a/lld/test/MachO/linkedit-contiguity.s +++ b/lld/test/MachO/linkedit-contiguity.s @@ -9,13 +9,13 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libhello.s \ # RUN: -o %t/libhello.o -# RUN: lld -flavor darwinnew -dylib -L%S/Inputs/MacOSX.sdk/usr/lib \ +# RUN: %lld -dylib \ # RUN: -install_name @executable_path/libhello.dylib %t/libhello.o \ # RUN: -o %t/libhello.dylib # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -o %t/test \ -# RUN: -L%S/Inputs/MacOSX.sdk/usr/lib -L%t -lhello %t/test.o -lSystem +# RUN: %lld -o %t/test \ +# RUN: -L%t -lhello %t/test.o -lSystem # RUN: llvm-objdump --macho --all-headers %t/test | FileCheck %s diff --git a/lld/test/MachO/lit.local.cfg b/lld/test/MachO/lit.local.cfg new file mode 100644 index 0000000..90ee911 --- /dev/null +++ b/lld/test/MachO/lit.local.cfg @@ -0,0 +1,6 @@ +# -*- Python -*- + +import os + +config.substitutions.append(('%lld', 'lld -flavor darwinnew -syslibroot ' + + os.path.join(config.test_source_root, "MachO", "Inputs", "MacOSX.sdk"))) diff --git a/lld/test/MachO/load-commands.s b/lld/test/MachO/load-commands.s index 3e9c07c..5e29cec 100644 --- a/lld/test/MachO/load-commands.s +++ b/lld/test/MachO/load-commands.s @@ -1,9 +1,9 @@ # REQUIRES: x86 # RUN: rm -rf %t && mkdir -p %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -o %t/executable %t/test.o -# RUN: lld -flavor darwinnew -bundle -o %t/bundle %t/test.o -# RUN: lld -flavor darwinnew -dylib -o %t/dylib %t/test.o +# RUN: %lld -o %t/executable %t/test.o +# RUN: %lld -bundle -o %t/bundle %t/test.o +# RUN: %lld -dylib -o %t/dylib %t/test.o ## These load commands should be in every final output binary. # COMMON-DAG: cmd LC_DYLD_INFO_ONLY diff --git a/lld/test/MachO/local-got.s b/lld/test/MachO/local-got.s index eccb1c8..60fedb1 100644 --- a/lld/test/MachO/local-got.s +++ b/lld/test/MachO/local-got.s @@ -2,10 +2,10 @@ # 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 -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -dylib -install_name \ +# 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 -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/test %t/test.o -L%t -lhello +# 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 ## Check that the GOT references the cstrings. --full-contents displays the @@ -29,7 +29,7 @@ # CHECK-NEXT: segment section address type addend dylib symbol # CHECK-NEXT: __DATA_CONST __got 0x[[#ADDR+16]] pointer 0 libhello _hello_its_me -# RUN: lld -flavor darwinnew -pie -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/test %t/test.o -L%t -lhello +# 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 diff --git a/lld/test/MachO/no-exports-dylib.s b/lld/test/MachO/no-exports-dylib.s index 896c31ef..7a1afae 100644 --- a/lld/test/MachO/no-exports-dylib.s +++ b/lld/test/MachO/no-exports-dylib.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib +# RUN: %lld -dylib %t.o -o %t.dylib # RUN: obj2yaml %t.dylib | FileCheck %s # CHECK: export_size: 0 diff --git a/lld/test/MachO/no-unneeded-dyld-info.s b/lld/test/MachO/no-unneeded-dyld-info.s index 11a3159..b69950f 100644 --- a/lld/test/MachO/no-unneeded-dyld-info.s +++ b/lld/test/MachO/no-unneeded-dyld-info.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s # CHECK: cmd LC_DYLD_INFO_ONLY diff --git a/lld/test/MachO/nonweak-definition-override.s b/lld/test/MachO/nonweak-definition-override.s index c531d2b..30bf5d3 100644 --- a/lld/test/MachO/nonweak-definition-override.s +++ b/lld/test/MachO/nonweak-definition-override.s @@ -4,14 +4,14 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/nonweakdef.s -o %t/nonweakdef.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weakdef.s -o %t/weakdef.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/common.s -o %t/common.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -dylib %t/libfoo.o -o %t/libfoo.dylib +# RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib ## Check that non-weak defined symbols override weak dylib symbols. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk %t/nonweakdef.o -L%t -lfoo -o %t/nonweakdef -lSystem +# RUN: %lld %t/nonweakdef.o -L%t -lfoo -o %t/nonweakdef -lSystem # RUN: llvm-objdump --macho --weak-bind %t/nonweakdef | FileCheck %s ## Test loading the dylib before the obj file. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -L%t -lfoo %t/nonweakdef.o -o %t/nonweakdef -lSystem +# RUN: %lld -L%t -lfoo %t/nonweakdef.o -o %t/nonweakdef -lSystem # RUN: llvm-objdump --macho --weak-bind %t/nonweakdef | FileCheck %s # CHECK: Weak bind table: @@ -20,11 +20,11 @@ # CHECK-EMPTY: ## Check that weak defined symbols do not override weak dylib symbols. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk %t/weakdef.o -L%t -lfoo -o %t/weakdef -lSystem +# RUN: %lld %t/weakdef.o -L%t -lfoo -o %t/weakdef -lSystem # RUN: llvm-objdump --macho --weak-bind %t/weakdef | FileCheck %s --check-prefix=NO-WEAK-OVERRIDE ## Test loading the dylib before the obj file. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -L%t -lfoo %t/weakdef.o -o %t/weakdef -lSystem +# RUN: %lld -L%t -lfoo %t/weakdef.o -o %t/weakdef -lSystem # RUN: llvm-objdump --macho --weak-bind %t/weakdef | FileCheck %s --check-prefix=NO-WEAK-OVERRIDE # NO-WEAK-OVERRIDE: Weak bind table: @@ -33,7 +33,7 @@ ## Check that common symbols take precedence over weak dylib symbols, but do not ## generate an overridding weak binding. -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -L%t -lfoo %t/common.o -o %t/common -lSystem +# RUN: %lld -L%t -lfoo %t/common.o -o %t/common -lSystem # RUN: llvm-objdump --macho --weak-bind %t/common | FileCheck %s --check-prefix=NO-WEAK-OVERRIDE # RUN: llvm-objdump --syms %t/common | FileCheck %s --check-prefix=COMMON # COMMON-DAG: g O __DATA,__common _nonweak_in_dylib diff --git a/lld/test/MachO/objc.s b/lld/test/MachO/objc.s index f08acee..48ca60b 100644 --- a/lld/test/MachO/objc.s +++ b/lld/test/MachO/objc.s @@ -10,7 +10,7 @@ # RUN: llvm-ar rcs %t/libHasSomeObjC.a %t/has-objc-symbol.o %t/has-objc-category.o %t/has-swift.o %t/no-objc.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem %t/test.o -o %t/test \ +# RUN: %lld -lSystem %t/test.o -o %t/test \ # RUN: -L%t -lHasSomeObjC -ObjC # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=OBJC @@ -24,7 +24,7 @@ # OBJC-NEXT: g F __TEXT,__text _main # OBJC-NEXT: g F __TEXT,__text _OBJC_CLASS_$_MyObject -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem %t/test.o -o %t/test \ +# RUN: %lld -lSystem %t/test.o -o %t/test \ # RUN: -L%t -lHasSomeObjC # RUN: llvm-objdump --section-headers --syms %t/test | FileCheck %s --check-prefix=NO-OBJC diff --git a/lld/test/MachO/order-file.s b/lld/test/MachO/order-file.s index 4ced92a..24b7ce4 100644 --- a/lld/test/MachO/order-file.s +++ b/lld/test/MachO/order-file.s @@ -14,67 +14,67 @@ # RUN: echo "_foo # just a comment" > %t/ord-1 # RUN: echo "_main # another comment" >> %t/ord-1 -# RUN: lld -flavor darwinnew -o %t/test-1 %t/test.o %t/foo.o -order_file %t/ord-1 +# RUN: %lld -o %t/test-1 %t/test.o %t/foo.o -order_file %t/ord-1 # RUN: llvm-objdump -d %t/test-1 | FileCheck %s --check-prefix=FOO-FIRST ## Output should be the same regardless of the command-line order of object files -# RUN: lld -flavor darwinnew -o %t/test-1 %t/foo.o %t/test.o -order_file %t/ord-1 +# RUN: %lld -o %t/test-1 %t/foo.o %t/test.o -order_file %t/ord-1 # RUN: llvm-objdump -d %t/test-1 | FileCheck %s --check-prefix=FOO-FIRST # RUN: echo "_main # just a comment" > %t/ord-2 # RUN: echo "_foo # another comment" >> %t/ord-2 -# RUN: lld -flavor darwinnew -o %t/test-2 %t/test.o %t/foo.o -order_file %t/ord-2 +# RUN: %lld -o %t/test-2 %t/test.o %t/foo.o -order_file %t/ord-2 # RUN: llvm-objdump -d %t/test-2 | FileCheck %s --check-prefix=FOO-SECOND -# RUN: lld -flavor darwinnew -o %t/test-2 %t/foo.o %t/test.o -order_file %t/ord-2 +# RUN: %lld -o %t/test-2 %t/foo.o %t/test.o -order_file %t/ord-2 # RUN: llvm-objdump -d %t/test-2 | FileCheck %s --check-prefix=FOO-SECOND # RUN: echo "foo.o:_foo" > %t/ord-file-match # RUN: echo "_main" >> %t/ord-file-match -# RUN: lld -flavor darwinnew -o %t/test-file-match %t/test.o %t/foo.o -order_file %t/ord-file-match +# RUN: %lld -o %t/test-file-match %t/test.o %t/foo.o -order_file %t/ord-file-match # RUN: llvm-objdump -d %t/test-file-match | FileCheck %s --check-prefix=FOO-FIRST ## Output should be the same regardless of the command-line order of object files -# RUN: lld -flavor darwinnew -o %t/test-file-match %t/foo.o %t/test.o -order_file %t/ord-file-match +# RUN: %lld -o %t/test-file-match %t/foo.o %t/test.o -order_file %t/ord-file-match # RUN: llvm-objdump -d %t/test-file-match | FileCheck %s --check-prefix=FOO-FIRST # RUN: echo "bar.o:_foo" > %t/ord-file-nomatch # RUN: echo "_main" >> %t/ord-file-nomatch # RUN: echo "_foo" >> %t/ord-file-nomatch -# RUN: lld -flavor darwinnew -o %t/test-file-nomatch %t/test.o %t/foo.o -order_file %t/ord-file-nomatch +# RUN: %lld -o %t/test-file-nomatch %t/test.o %t/foo.o -order_file %t/ord-file-nomatch # RUN: llvm-objdump -d %t/test-file-nomatch | FileCheck %s --check-prefix=FOO-SECOND -# RUN: lld -flavor darwinnew -o %t/test-file-nomatch %t/foo.o %t/test.o -order_file %t/ord-file-nomatch +# RUN: %lld -o %t/test-file-nomatch %t/foo.o %t/test.o -order_file %t/ord-file-nomatch # RUN: llvm-objdump -d %t/test-file-nomatch | FileCheck %s --check-prefix=FOO-SECOND # RUN: echo "x86_64:_foo" > %t/ord-arch-match # RUN: echo "_main" >> %t/ord-arch-match -# RUN: lld -flavor darwinnew -o %t/test-arch-match %t/test.o %t/foo.o -order_file %t/ord-arch-match +# RUN: %lld -o %t/test-arch-match %t/test.o %t/foo.o -order_file %t/ord-arch-match # RUN: llvm-objdump -d %t/test-arch-match | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-arch-match %t/foo.o %t/test.o -order_file %t/ord-arch-match +# RUN: %lld -o %t/test-arch-match %t/foo.o %t/test.o -order_file %t/ord-arch-match # RUN: llvm-objdump -d %t/test-arch-match | FileCheck %s --check-prefix=FOO-FIRST # RUN: echo "ppc:_foo" > %t/ord-arch-nomatch # RUN: echo "_main" >> %t/ord-arch-nomatch # RUN: echo "_foo" >> %t/ord-arch-nomatch -# RUN: lld -flavor darwinnew -o %t/test-arch-nomatch %t/test.o %t/foo.o -order_file %t/ord-arch-nomatch +# RUN: %lld -o %t/test-arch-nomatch %t/test.o %t/foo.o -order_file %t/ord-arch-nomatch # RUN: llvm-objdump -d %t/test-arch-nomatch | FileCheck %s --check-prefix=FOO-SECOND -# RUN: lld -flavor darwinnew -o %t/test-arch-nomatch %t/foo.o %t/test.o -order_file %t/ord-arch-nomatch +# RUN: %lld -o %t/test-arch-nomatch %t/foo.o %t/test.o -order_file %t/ord-arch-nomatch # RUN: llvm-objdump -d %t/test-arch-nomatch | FileCheck %s --check-prefix=FOO-SECOND # RUN: echo "x86_64:bar.o:_foo" > %t/ord-arch-file-match # RUN: echo "_main" >> %t/ord-arch-match -# RUN: lld -flavor darwinnew -o %t/test-arch-match %t/test.o %t/foo.o -order_file %t/ord-arch-match +# RUN: %lld -o %t/test-arch-match %t/test.o %t/foo.o -order_file %t/ord-arch-match # RUN: llvm-objdump -d %t/test-arch-match | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-arch-match %t/foo.o %t/test.o -order_file %t/ord-arch-match +# RUN: %lld -o %t/test-arch-match %t/foo.o %t/test.o -order_file %t/ord-arch-match # RUN: llvm-objdump -d %t/test-arch-match | FileCheck %s --check-prefix=FOO-FIRST ## Test archives -# RUN: lld -flavor darwinnew -o %t/test-archive-1 %t/test.o %t/foo.a -order_file %t/ord-1 +# RUN: %lld -o %t/test-archive-1 %t/test.o %t/foo.a -order_file %t/ord-1 # RUN: llvm-objdump -d %t/test-archive-1 | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-archive-1 %t/foo.a %t/test.o -order_file %t/ord-1 +# RUN: %lld -o %t/test-archive-1 %t/foo.a %t/test.o -order_file %t/ord-1 # RUN: llvm-objdump -d %t/test-archive-1 | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-archive-file-no-match %t/test.o %t/foo.a -order_file %t/ord-file-nomatch +# RUN: %lld -o %t/test-archive-file-no-match %t/test.o %t/foo.a -order_file %t/ord-file-nomatch # RUN: llvm-objdump -d %t/test-archive-file-no-match | FileCheck %s --check-prefix=FOO-SECOND -# RUN: lld -flavor darwinnew -o %t/test-archive %t/foo.a %t/test.o -order_file %t/ord-file-nomatch +# RUN: %lld -o %t/test-archive %t/foo.a %t/test.o -order_file %t/ord-file-nomatch # RUN: llvm-objdump -d %t/test-archive-file-no-match | FileCheck %s --check-prefix=FOO-SECOND ## The following tests check that if an address is matched by multiple order @@ -83,33 +83,33 @@ # RUN: echo "_foo" > %t/ord-multiple-1 # RUN: echo "_main" >> %t/ord-multiple-1 # RUN: echo "foo.o:_foo" >> %t/ord-multiple-1 -# RUN: lld -flavor darwinnew -o %t/test-1 %t/test.o %t/foo.o -order_file %t/ord-multiple-1 +# RUN: %lld -o %t/test-1 %t/test.o %t/foo.o -order_file %t/ord-multiple-1 # RUN: llvm-objdump -d %t/test-1 | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-1 %t/foo.o %t/test.o -order_file %t/ord-multiple-1 +# RUN: %lld -o %t/test-1 %t/foo.o %t/test.o -order_file %t/ord-multiple-1 # RUN: llvm-objdump -d %t/test-1 | FileCheck %s --check-prefix=FOO-FIRST # RUN: echo "foo.o:_foo" > %t/ord-multiple-2 # RUN: echo "_main" >> %t/ord-multiple-2 # RUN: echo "_foo" >> %t/ord-multiple-2 -# RUN: lld -flavor darwinnew -o %t/test-2 %t/test.o %t/foo.o -order_file %t/ord-multiple-2 +# RUN: %lld -o %t/test-2 %t/test.o %t/foo.o -order_file %t/ord-multiple-2 # RUN: llvm-objdump -d %t/test-2 | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-2 %t/foo.o %t/test.o -order_file %t/ord-multiple-2 +# RUN: %lld -o %t/test-2 %t/foo.o %t/test.o -order_file %t/ord-multiple-2 # RUN: llvm-objdump -d %t/test-2 | FileCheck %s --check-prefix=FOO-FIRST # RUN: echo "_foo" > %t/ord-multiple-3 # RUN: echo "_main" >> %t/ord-multiple-3 # RUN: echo "_foo" >> %t/ord-multiple-3 -# RUN: lld -flavor darwinnew -o %t/test-3 %t/test.o %t/foo.o -order_file %t/ord-multiple-3 +# RUN: %lld -o %t/test-3 %t/test.o %t/foo.o -order_file %t/ord-multiple-3 # RUN: llvm-objdump -d %t/test-3 | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-3 %t/foo.o %t/test.o -order_file %t/ord-multiple-3 +# RUN: %lld -o %t/test-3 %t/foo.o %t/test.o -order_file %t/ord-multiple-3 # RUN: llvm-objdump -d %t/test-3 | FileCheck %s --check-prefix=FOO-FIRST # RUN: echo "foo.o:_foo" > %t/ord-multiple-4 # RUN: echo "_main" >> %t/ord-multiple-4 # RUN: echo "foo.o:_foo" >> %t/ord-multiple-4 -# RUN: lld -flavor darwinnew -o %t/test-4 %t/test.o %t/foo.o -order_file %t/ord-multiple-4 +# RUN: %lld -o %t/test-4 %t/test.o %t/foo.o -order_file %t/ord-multiple-4 # RUN: llvm-objdump -d %t/test-4 | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-4 %t/foo.o %t/test.o -order_file %t/ord-multiple-4 +# RUN: %lld -o %t/test-4 %t/foo.o %t/test.o -order_file %t/ord-multiple-4 # RUN: llvm-objdump -d %t/test-4 | FileCheck %s --check-prefix=FOO-FIRST ## _foo and _bar both point to the same location. When both symbols appear in @@ -118,9 +118,9 @@ # RUN: echo "_bar" > %t/ord-alias # RUN: echo "_main" >> %t/ord-alias # RUN: echo "_foo" >> %t/ord-alias -# RUN: lld -flavor darwinnew -o %t/test-alias %t/test.o %t/foo.o -order_file %t/ord-alias +# RUN: %lld -o %t/test-alias %t/test.o %t/foo.o -order_file %t/ord-alias # RUN: llvm-objdump -d %t/test-alias | FileCheck %s --check-prefix=FOO-FIRST -# RUN: lld -flavor darwinnew -o %t/test-alias %t/foo.o %t/test.o -order_file %t/ord-alias +# RUN: %lld -o %t/test-alias %t/foo.o %t/test.o -order_file %t/ord-alias # RUN: llvm-objdump -d %t/test-alias | FileCheck %s --check-prefix=FOO-FIRST .text diff --git a/lld/test/MachO/platform-version.s b/lld/test/MachO/platform-version.s index 5feb2b25..326a744 100644 --- a/lld/test/MachO/platform-version.s +++ b/lld/test/MachO/platform-version.s @@ -5,56 +5,56 @@ ### with bad version strings, so we use *-NOT patterns to ensure that ### no "malformed platform" diagnostic appears in those cases. -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version \ # RUN: | FileCheck --check-prefix=FAIL-MISSING %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version wtf \ # RUN: | FileCheck --check-prefix=FAIL-MISSING %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version lolz 1.2.3.4.5 \ # RUN: | FileCheck --check-prefix=FAIL-MISSING %s # FAIL-MISSING: -platform_version: missing argument # FAIL-MISSING-NOT: malformed platform: {{.*}} # FAIL-MISSING-NOT: malformed {{minimum|sdk}} version: {{.*}} -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version macOS -lfoo 2 \ # RUN: | FileCheck --check-prefix=FAIL-MALFORM %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version iOS 1 2.a \ # RUN: | FileCheck --check-prefix=FAIL-MALFORM %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version tvOS 1.2.3.4.5 10 \ # RUN: | FileCheck --check-prefix=FAIL-MALFORM %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version watchOS 10 1.2.3.4.5 \ # RUN: | FileCheck --check-prefix=FAIL-MALFORM %s # FAIL-MALFORM-NOT: malformed platform: {{.*}} # FAIL-MALFORM: malformed {{minimum|sdk}} version: {{.*}} -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version bridgeOS 1 5 -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version "Mac Catalyst" 1.2 5.6 -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version "iOS Simulator" 1.2.3 5.6.7 -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version tvOS-Simulator 1.2.3.4 5.6.7.8 -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version watchOS-Simulator 1 5 -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version 1 1 5 -# RUN: lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: %lld -o %t %t.o 2>&1 \ # RUN: -platform_version 9 1 5 -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version wtf 1 5 \ # RUN: | FileCheck --check-prefix=FAIL-PLATFORM %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version 0 1 5 \ # RUN: | FileCheck --check-prefix=FAIL-PLATFORM %s -# RUN: not lld -flavor darwinnew -Z -o %t %t.o 2>&1 \ +# RUN: not %lld -o %t %t.o 2>&1 \ # RUN: -platform_version 10 1 5 \ # RUN: | FileCheck --check-prefix=FAIL-PLATFORM %s # FAIL-PLATFORM: malformed platform: {{.*}} diff --git a/lld/test/MachO/reexport-stub.s b/lld/test/MachO/reexport-stub.s index d2139c8..c63e498 100644 --- a/lld/test/MachO/reexport-stub.s +++ b/lld/test/MachO/reexport-stub.s @@ -4,7 +4,7 @@ ## This test verifies that a non-TBD dylib can re-export a TBD library. # RUN: echo "" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/reexporter.o -# RUN: lld -flavor darwinnew -dylib -syslibroot %S/Inputs/MacOSX.sdk -lc++ -sub_library libc++ \ +# RUN: %lld -dylib -lc++ -sub_library libc++ \ # RUN: %t/reexporter.o -o %t/libreexporter.dylib # RUN: llvm-objdump --macho --all-headers %t/libreexporter.dylib | FileCheck %s --check-prefix=DYLIB-HEADERS # DYLIB-HEADERS: cmd LC_REEXPORT_DYLIB @@ -12,7 +12,7 @@ # DYLIB-HEADERS: name /usr/lib/libc++.dylib # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -o %t/test -syslibroot %S/Inputs/MacOSX.sdk -lSystem -L%t -lreexporter %t/test.o +# RUN: %lld -o %t/test -lSystem -L%t -lreexporter %t/test.o # RUN: llvm-objdump --bind --no-show-raw-insn -d %t/test | FileCheck %s # CHECK: Bind table: diff --git a/lld/test/MachO/relocations.s b/lld/test/MachO/relocations.s index e6f7778..7ed3658 100644 --- a/lld/test/MachO/relocations.s +++ b/lld/test/MachO/relocations.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t %t.o +# RUN: %lld -lSystem -o %t %t.o # RUN: llvm-objdump --section-headers --syms -d %t | FileCheck %s # CHECK-LABEL: Sections: diff --git a/lld/test/MachO/resolution.s b/lld/test/MachO/resolution.s index a13bb52..056324b 100644 --- a/lld/test/MachO/resolution.s +++ b/lld/test/MachO/resolution.s @@ -2,19 +2,19 @@ # RUN: mkdir -p %t # RUN: echo '.globl _foo, _bar, _baz; _foo: _bar: _baz:' | \ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/libresolution.o -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libresolution.dylib %t/libresolution.o -o %t/libresolution.dylib -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libresolution2.dylib %t/libresolution.o -o %t/libresolution2.dylib # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/resolution.o ## Check that we select the symbol defined in the first dylib passed on the ## command line. -# RUN: lld -flavor darwinnew -o %t/dylib-first -Z -L%t -lresolution -lresolution2 %t/resolution.o +# RUN: %lld -o %t/dylib-first -L%t -lresolution -lresolution2 %t/resolution.o # RUN: llvm-objdump --macho --bind %t/dylib-first | FileCheck %s --check-prefix=DYLIB-FIRST # DYLIB-FIRST: libresolution _foo -# RUN: lld -flavor darwinnew -o %t/dylib2-first -Z -L%t -lresolution2 -lresolution %t/resolution.o +# RUN: %lld -o %t/dylib2-first -L%t -lresolution2 -lresolution %t/resolution.o # RUN: llvm-objdump --macho --bind %t/dylib2-first | FileCheck %s --check-prefix=DYLIB2-FIRST # DYLIB2-FIRST: libresolution2 _foo @@ -24,7 +24,7 @@ ## Check that we pick the dylib symbol over the undefined symbol in the object ## file, even if the object file appears first on the command line. -# RUN: lld -flavor darwinnew -o %t/obj-first -Z -L%t %t/resolution.o -lresolution +# RUN: %lld -o %t/obj-first -L%t %t/resolution.o -lresolution # RUN: llvm-objdump --macho --bind %t/obj-first | FileCheck %s --check-prefix=OBJ-FIRST # OBJ-FIRST: libresolution _foo ## But defined symbols should still take precedence. diff --git a/lld/test/MachO/rpath.s b/lld/test/MachO/rpath.s index e72fe5b6..dc99888 100644 --- a/lld/test/MachO/rpath.s +++ b/lld/test/MachO/rpath.s @@ -1,9 +1,9 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o ## Check that -rpath generates LC_RPATH. -# RUN: lld -flavor darwinnew -o %t %t.o -rpath /some/rpath +# RUN: %lld -o %t %t.o -rpath /some/rpath # RUN: llvm-objdump --macho --all-headers %t | FileCheck %s # CHECK: LC_RPATH # CHECK-NEXT: cmdsize 24 diff --git a/lld/test/MachO/search-paths.test b/lld/test/MachO/search-paths.test index 8249f27..4dc0c73 100644 --- a/lld/test/MachO/search-paths.test +++ b/lld/test/MachO/search-paths.test @@ -2,13 +2,15 @@ UNSUPPORTED: darwin RUN: mkdir -p %t1 %t2 -RUN: lld -flavor darwinnew -Z -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s +RUN: %lld -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s CHECK: Library search paths: CHECK-NEXT: [[LDIR]] +CHECK-NEXT: /usr/lib CHECK-NEXT: Framework search paths: CHECK-NEXT: [[FDIR]] +CHECK-NEXT: /System/Library/Frameworks -RUN: lld -flavor darwinnew -Z -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s +RUN: %lld -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s CHECK_Z: Library search paths: CHECK_Z-NEXT: [[LDIR]] CHECK_Z-NEXT: Framework search paths: diff --git a/lld/test/MachO/sectcreate.s b/lld/test/MachO/sectcreate.s index 482e3e5..c90b372 100644 --- a/lld/test/MachO/sectcreate.s +++ b/lld/test/MachO/sectcreate.s @@ -3,7 +3,7 @@ # RUN: echo "-sectcreate 1.1" >%t1 # RUN: echo "-sectcreate 1.2" >%t2 # RUN: echo "-sectcreate 2" >%t3 -# RUN: lld -flavor darwinnew -Z \ +# RUN: %lld \ # RUN: -sectcreate SEG SEC1 %t1 \ # RUN: -sectcreate SEG SEC2 %t3 \ # RUN: -sectcreate SEG SEC1 %t2 \ diff --git a/lld/test/MachO/section-headers.s b/lld/test/MachO/section-headers.s index fdfdbed..f44f039 100644 --- a/lld/test/MachO/section-headers.s +++ b/lld/test/MachO/section-headers.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-readobj --section-headers --macho-segment %t | FileCheck %s # CHECK: Name: __text diff --git a/lld/test/MachO/section-merge.s b/lld/test/MachO/section-merge.s index 34c19d7..7db4157 100644 --- a/lld/test/MachO/section-merge.s +++ b/lld/test/MachO/section-merge.s @@ -6,7 +6,7 @@ # RUN: echo ".globl _baz; .data; .p2align 3; _baz: .byte 0xba" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/baz.o # RUN: echo ".globl _qux; .data; .p2align 0; _qux: .quad 0xdeadbeef" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/qux.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/main.o -# RUN: lld -flavor darwinnew -o %t/output %t/foo.o %t/bar.o %t/baz.o %t/qux.o %t/main.o +# RUN: %lld -o %t/output %t/foo.o %t/bar.o %t/baz.o %t/qux.o %t/main.o # RUN: llvm-objdump --syms --section=__data --full-contents %t/output | FileCheck %s # CHECK: SYMBOL TABLE: diff --git a/lld/test/MachO/segments.s b/lld/test/MachO/segments.s index e0f127f..07ddcae 100644 --- a/lld/test/MachO/segments.s +++ b/lld/test/MachO/segments.s @@ -1,6 +1,6 @@ # REQUIRES: x86, shell # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: (llvm-readobj --macho-segment %t; echo "Total file size"; wc -c %t) | FileCheck %s ## These two segments must always be present at the start of an executable. diff --git a/lld/test/MachO/silent-ignore.test b/lld/test/MachO/silent-ignore.test index 3ee3b82..1038a7e 100644 --- a/lld/test/MachO/silent-ignore.test +++ b/lld/test/MachO/silent-ignore.test @@ -1,4 +1,4 @@ -RUN: lld -flavor darwinnew -v \ +RUN: %lld -v \ RUN: -demangle \ RUN: -dynamic \ RUN: -no_deduplicate \ @@ -6,5 +6,5 @@ RUN: -lto_library /lib/foo \ RUN: -macosx_version_min 0 \ RUN: -dependency_info /path/to/dependency_info.dat \ RUN: -mllvm -time-passes -RUN: not lld -flavor darwinnew -v --not-an-ignored-argument 2>&1 | FileCheck %s +RUN: not %lld -v --not-an-ignored-argument 2>&1 | FileCheck %s CHECK: error: unknown argument: --not-an-ignored-argument diff --git a/lld/test/MachO/static-link.s b/lld/test/MachO/static-link.s index f826080..1306aa60 100644 --- a/lld/test/MachO/static-link.s +++ b/lld/test/MachO/static-link.s @@ -6,7 +6,7 @@ # RUN: llvm-ar --format=darwin crs %t/libgoodbye.a %t/goodbye.o # # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -o %t/test -Z -L%t -lgoodbye %t/test.o +# RUN: %lld -o %t/test -L%t -lgoodbye %t/test.o # # RUN: llvm-objdump --syms -d -r %t/test | FileCheck %s diff --git a/lld/test/MachO/stub-framework.s b/lld/test/MachO/stub-framework.s index cf24266..1cfc32b 100644 --- a/lld/test/MachO/stub-framework.s +++ b/lld/test/MachO/stub-framework.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: mkdir -p %t # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -o %t/test -Z -F%S/Inputs/MacOSX.sdk/System/Library/Frameworks -framework CoreFoundation %t/test.o +# RUN: %lld -o %t/test -framework CoreFoundation %t/test.o # # RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck %s # CHECK: /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation diff --git a/lld/test/MachO/stub-link.s b/lld/test/MachO/stub-link.s index 04d0104..df8d947 100644 --- a/lld/test/MachO/stub-link.s +++ b/lld/test/MachO/stub-link.s @@ -3,7 +3,7 @@ # RUN: mkdir -p %t # # RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -o %t/test -syslibroot %S/Inputs/MacOSX.sdk -lSystem -lc++ -framework CoreFoundation %t/test.o +# RUN: %lld -o %t/test -lSystem -lc++ -framework CoreFoundation %t/test.o # # RUN: llvm-objdump --bind --no-show-raw-insn -d -r %t/test | FileCheck %s diff --git a/lld/test/MachO/sub-library.s b/lld/test/MachO/sub-library.s index bbaafd4..0e5b596 100644 --- a/lld/test/MachO/sub-library.s +++ b/lld/test/MachO/sub-library.s @@ -8,10 +8,10 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %p/Inputs/libgoodbye.s \ # RUN: -o %t/libgoodbye.o # RUN: echo "" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/libsuper.o -# RUN: lld -flavor darwinnew -dylib %t/libhello.o -o %t/libhello.dylib -# RUN: lld -flavor darwinnew -dylib -L%t -sub_library libhello -lhello \ +# RUN: %lld -dylib %t/libhello.o -o %t/libhello.dylib +# RUN: %lld -dylib -L%t -sub_library libhello -lhello \ # RUN: %t/libgoodbye.o -o %t/libgoodbye.dylib -# RUN: lld -flavor darwinnew -dylib -L%t -sub_library libgoodbye -lgoodbye -install_name \ +# RUN: %lld -dylib -L%t -sub_library libgoodbye -lgoodbye -install_name \ # RUN: @executable_path/libsuper.dylib %t/libsuper.o -o %t/libsuper.dylib @@ -37,7 +37,7 @@ # SUPER-HEADERS: name [[DIR]]/libgoodbye.dylib # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/sub-library.o -# RUN: lld -flavor darwinnew -o %t/sub-library -L%t -lsuper %t/sub-library.o +# RUN: %lld -o %t/sub-library -L%t -lsuper %t/sub-library.o # RUN: llvm-objdump --macho --bind %t/sub-library | FileCheck %s # CHECK-LABEL: Bind table: @@ -46,11 +46,11 @@ ## Check that we fail gracefully if the sub-library is missing -# RUN: not lld -flavor darwinnew -dylib -Z -o %t/sub-library -sub_library libmissing %t/sub-library.o 2>&1 \ +# RUN: not %lld -dylib -o %t/sub-library -sub_library libmissing %t/sub-library.o 2>&1 \ # RUN: | FileCheck %s --check-prefix=MISSING-SUB-LIBRARY # MISSING-SUB-LIBRARY: error: -sub_library libmissing does not match a supplied dylib # RUN: rm -f %t/libgoodbye.dylib -# RUN: not lld -flavor darwinnew -o %t/sub-library -Z -L%t -lsuper %t/sub-library.o 2>&1 \ +# RUN: not %lld -o %t/sub-library -L%t -lsuper %t/sub-library.o 2>&1 \ # RUN: | FileCheck %s --check-prefix=MISSING-REEXPORT -DDIR=%t # MISSING-REEXPORT: error: unable to locate re-export with install name [[DIR]]/libgoodbye.dylib diff --git a/lld/test/MachO/subsections-section-relocs.s b/lld/test/MachO/subsections-section-relocs.s index e8a8d7a..7b7ffe2 100644 --- a/lld/test/MachO/subsections-section-relocs.s +++ b/lld/test/MachO/subsections-section-relocs.s @@ -5,7 +5,7 @@ # RUN: echo "_bar_str" > %t/order-file # RUN: echo "_foo_str" >> %t/order-file -# RUN: lld -flavor darwinnew -o %t/test %t/test.o -order_file %t/order-file +# RUN: %lld -o %t/test %t/test.o -order_file %t/order-file # RUN: llvm-objdump --section-headers -d --no-show-raw-insn %t/test | FileCheck %s # CHECK-LABEL: Sections: # CHECK: __cstring {{[^ ]*}} {{0*}}[[#%x, CSTRING_ADDR:]] diff --git a/lld/test/MachO/subsections-symbol-relocs.s b/lld/test/MachO/subsections-symbol-relocs.s index 475c909..bb54705 100644 --- a/lld/test/MachO/subsections-symbol-relocs.s +++ b/lld/test/MachO/subsections-symbol-relocs.s @@ -17,9 +17,9 @@ # RUN: echo "_main" >> %t/order-file-2 # RUN: echo "_qux" >> %t/order-file-2 -# RUN: lld -flavor darwinnew -o %t/test-1 %t/test.o -order_file %t/order-file-1 +# RUN: %lld -o %t/test-1 %t/test.o -order_file %t/order-file-1 # RUN: llvm-objdump -d --no-show-raw-insn %t/test-1 | FileCheck %s -# RUN: lld -flavor darwinnew -o %t/test-2 %t/test.o -order_file %t/order-file-2 +# RUN: %lld -o %t/test-2 %t/test.o -order_file %t/order-file-2 # RUN: llvm-objdump -d --no-show-raw-insn %t/test-2 | FileCheck %s # CHECK-LABEL: Disassembly of section __TEXT,__text: # CHECK: <_bar>: diff --git a/lld/test/MachO/symbol-order.s b/lld/test/MachO/symbol-order.s index 328ff9e..c61e7c8 100644 --- a/lld/test/MachO/symbol-order.s +++ b/lld/test/MachO/symbol-order.s @@ -5,7 +5,7 @@ # RUN: echo ".global f; .section __TEXT,test_f2; f: ret" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/f2.o # RUN: echo ".global f, g; .section __TEXT,test_fg; f: ret; g: callq f" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/fg.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -dylib -o %t/libf1.dylib %t/f1.o -lSystem +# RUN: %lld -dylib -o %t/libf1.dylib %t/f1.o -lSystem # RUN: rm -f %t/libf2_g.a # RUN: llvm-ar rcs %t/libf2_g.a %t/f2.o %t/g.o @@ -13,7 +13,7 @@ # RUN: rm -f %t/libfg.a # RUN: llvm-ar rcs %t/libfg.a %t/fg.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib %t/libf1.dylib %t/libf2_g.a %t/test.o -o %t/test.out -lSystem +# RUN: %lld %t/libf1.dylib %t/libf2_g.a %t/test.o -o %t/test.out -lSystem # RUN: llvm-objdump --syms --macho --lazy-bind %t/test.out | FileCheck %s --check-prefix DYLIB-FIRST # DYLIB-FIRST: SYMBOL TABLE: # DYLIB-FIRST-DAG: __TEXT,test_g g @@ -21,7 +21,7 @@ # DYLIB-FIRST-NEXT: segment section address dylib symbol # DYLIB-FIRST-NEXT: __DATA __la_symbol_ptr {{[0-9a-z]+}} libf1 f -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib %t/libf2_g.a %t/libf1.dylib %t/test.o -o %t/test.out -lSystem +# RUN: %lld %t/libf2_g.a %t/libf1.dylib %t/test.o -o %t/test.out -lSystem # RUN: llvm-objdump --syms --macho --lazy-bind %t/test.out | FileCheck %s --check-prefix ARCHIVE-FIRST # ARCHIVE-FIRST: SYMBOL TABLE: # ARCHIVE-FIRST-DAG: __TEXT,test_f2 f @@ -30,7 +30,7 @@ # ARCHIVE-FIRST-NEXT: segment section address dylib symbol # ARCHIVE-FIRST-EMPTY: -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib %t/libf1.dylib %t/libfg.a %t/test.o -o %t/test.out -lSystem +# RUN: %lld %t/libf1.dylib %t/libfg.a %t/test.o -o %t/test.out -lSystem # RUN: llvm-objdump --syms --macho --lazy-bind %t/test.out | FileCheck %s --check-prefix ARCHIVE-PRIORITY # ARCHIVE-PRIORITY: SYMBOL TABLE: # ARCHIVE-PRIORITY-DAG: __TEXT,test_fg f diff --git a/lld/test/MachO/symtab.s b/lld/test/MachO/symtab.s index 1efa7a2..1e9ec15 100644 --- a/lld/test/MachO/symtab.s +++ b/lld/test/MachO/symtab.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-readobj -symbols %t | FileCheck %s # CHECK: Symbols [ diff --git a/lld/test/MachO/syslibroot.test b/lld/test/MachO/syslibroot.test index 0d2d822..b09156e 100644 --- a/lld/test/MachO/syslibroot.test +++ b/lld/test/MachO/syslibroot.test @@ -18,7 +18,7 @@ CHECK-ABSOLUTE-PATH-REROOTED: Library search paths: CHECK-ABSOLUTE-PATH-REROOTED: [[ROOT]]/Library/libxml2-development CHECK-ABSOLUTE-PATH-REROOTED: [[ROOT]]/usr/lib -RUN: lld -flavor darwinnew -v -Z -syslibroot %t -L %t/Library/libxml2-development | FileCheck %s -check-prefix CHECK-PATH-WITHOUT-REROOT -DPATH=%t/Library/libxml2-development +RUN: lld -flavor darwinnew -v -syslibroot %t -L %t/Library/libxml2-development | FileCheck %s -check-prefix CHECK-PATH-WITHOUT-REROOT -DPATH=%t/Library/libxml2-development CHECK-PATH-WITHOUT-REROOT: Library search paths: CHECK-PATH-WITHOUT-REROOT-NEXT: [[PATH]] diff --git a/lld/test/MachO/tlv-dylib.s b/lld/test/MachO/tlv-dylib.s index daa11be..c6f9b9a 100644 --- a/lld/test/MachO/tlv-dylib.s +++ b/lld/test/MachO/tlv-dylib.s @@ -2,14 +2,14 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libtlv.s -o %t/libtlv.o -# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libtlv.dylib \ -# RUN: -Z -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/libtlv.dylib %t/libtlv.o +# RUN: %lld -dylib -install_name @executable_path/libtlv.dylib \ +# RUN: -lSystem -o %t/libtlv.dylib %t/libtlv.o # RUN: llvm-objdump --exports-trie -d --no-show-raw-insn %t/libtlv.dylib | FileCheck %s --check-prefix=DYLIB # DYLIB-DAG: _foo [per-thread] # DYLIB-DAG: _bar [per-thread] # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o -# RUN: lld -flavor darwinnew -Z -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -L%t -ltlv %t/test.o -o %t/test +# RUN: %lld -lSystem -L%t -ltlv %t/test.o -o %t/test # RUN: llvm-objdump --bind -d --no-show-raw-insn %t/test | FileCheck %s # CHECK: movq [[#]](%rip), %rax # [[#%x, FOO:]] diff --git a/lld/test/MachO/tlv.s b/lld/test/MachO/tlv.s index d8e02ee..cf472bc 100644 --- a/lld/test/MachO/tlv.s +++ b/lld/test/MachO/tlv.s @@ -1,7 +1,7 @@ # REQUIRES: x86 # RUN: mkdir -p %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/test %t/test.o +# RUN: %lld -lSystem -o %t/test %t/test.o # RUN: llvm-readobj --file-headers %t/test | FileCheck %s --check-prefix=HEADER # RUN: llvm-objdump -D %t/test | FileCheck %s diff --git a/lld/test/MachO/weak-binding.s b/lld/test/MachO/weak-binding.s index fc4106b..f627daf 100644 --- a/lld/test/MachO/weak-binding.s +++ b/lld/test/MachO/weak-binding.s @@ -2,8 +2,8 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -dylib %t/libfoo.o -o %t/libfoo.dylib -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk %t/test.o -L%t -lfoo -o %t/test -lSystem +# RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib +# RUN: %lld %t/test.o -L%t -lfoo -o %t/test -lSystem # RUN: llvm-objdump -d --no-show-raw-insn --bind --lazy-bind --weak-bind --full-contents %t/test | \ # RUN: FileCheck %s diff --git a/lld/test/MachO/weak-definition-direct-fetch.s b/lld/test/MachO/weak-definition-direct-fetch.s index 04c022e..38b809c 100644 --- a/lld/test/MachO/weak-definition-direct-fetch.s +++ b/lld/test/MachO/weak-definition-direct-fetch.s @@ -8,9 +8,9 @@ # RUN: echo ".globl _foo; .section __TEXT,nonweak; _foo:" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/foo.o # RUN: echo ".globl _foo; .weak_definition _foo; .section __TEXT,weak; _foo:" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/weakfoo.o -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libfoo.dylib %t/foo.o -o %t/libfoo.dylib -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libweakfoo.dylib %t/weakfoo.o -o %t/libweakfoo.dylib # RUN: llvm-objdump --macho --exports-trie %t/libweakfoo.dylib | FileCheck %s --check-prefix WEAK-DYLIB-CHECK @@ -42,46 +42,46 @@ ## For dylibs and object files, the non-weak symbol always wins. But the weak ## flag has no effect when we are dealing with two archive symbols. -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-nonweak-dylibs -Z -L%t -lweakfoo -lfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-nonweak-dylibs -L%t -lweakfoo -lfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-nonweak-dylibs | FileCheck %s --check-prefix=PREFER-NONWEAK-DYLIB -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-weak-dylibs -Z -L%t -lfoo -lweakfoo %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-weak-dylibs -L%t -lfoo -lweakfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-weak-dylibs | FileCheck %s --check-prefix=PREFER-NONWEAK-DYLIB -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-nonweak-objs -Z -L%t %t/weakfoo.o %t/foo.o %t/test.o +# RUN: %lld -lSystem -o %t/weak-nonweak-objs -L%t %t/weakfoo.o %t/foo.o %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-nonweak-objs | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-weak-objs -Z -L%t %t/foo.o %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-weak-objs -L%t %t/foo.o %t/weakfoo.o %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-weak-objs | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-nonweak-archives -Z -L%t %t/weakfoo.a %t/foo.a %t/test.o +# RUN: %lld -lSystem -o %t/weak-nonweak-archives -L%t %t/weakfoo.a %t/foo.a %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-nonweak-archives | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-weak-archives -Z -L%t %t/foo.a %t/weakfoo.a %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-weak-archives -L%t %t/foo.a %t/weakfoo.a %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-weak-archives | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT ## The remaining lines test symbol pairs of different types. -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-dylib-weak-ar -Z -L%t -lweakfoo %t/weakfoo.a %t/test.o +# RUN: %lld -lSystem -o %t/weak-dylib-weak-ar -L%t -lweakfoo %t/weakfoo.a %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-dylib-weak-ar | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-ar-weak-dylib -Z -L%t %t/weakfoo.a -lweakfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-ar-weak-dylib -L%t %t/weakfoo.a -lweakfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-ar-weak-dylib | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-ar-nonweak-dylib -Z -L%t %t/weakfoo.a -lfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-ar-nonweak-dylib -L%t %t/weakfoo.a -lfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-ar-nonweak-dylib | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-dylib-weak-ar -Z -L%t -lfoo %t/weakfoo.a %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-dylib-weak-ar -L%t -lfoo %t/weakfoo.a %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-dylib-weak-ar | FileCheck %s --check-prefix=PREFER-NONWEAK-DYLIB -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-dylib-weak-obj -Z -L%t -lweakfoo %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/weak-dylib-weak-obj -L%t -lweakfoo %t/weakfoo.o %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-dylib-weak-obj | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-obj-weak-dylib -Z -L%t %t/weakfoo.o -lweakfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-obj-weak-dylib -L%t %t/weakfoo.o -lweakfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-obj-weak-dylib | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-obj-nonweak-dylib -Z -L%t %t/weakfoo.o -lfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-obj-nonweak-dylib -L%t %t/weakfoo.o -lfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-obj-nonweak-dylib | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-dylib-weak-obj -Z -L%t -lfoo %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-dylib-weak-obj -L%t -lfoo %t/weakfoo.o %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-dylib-weak-obj | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-obj-nonweak-ar -Z -L%t %t/weakfoo.o %t/foo.a %t/test.o +# RUN: %lld -lSystem -o %t/weak-obj-nonweak-ar -L%t %t/weakfoo.o %t/foo.a %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-obj-nonweak-ar | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-ar-weak-obj -Z -L%t %t/foo.a %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-ar-weak-obj -L%t %t/foo.a %t/weakfoo.o %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-ar-weak-obj | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT .globl _main diff --git a/lld/test/MachO/weak-definition-indirect-fetch.s b/lld/test/MachO/weak-definition-indirect-fetch.s index d22e0a3..3a45852 100644 --- a/lld/test/MachO/weak-definition-indirect-fetch.s +++ b/lld/test/MachO/weak-definition-indirect-fetch.s @@ -20,19 +20,19 @@ # PREFER-NONWEAK-OBJECT: O __TEXT,nonweak _foo -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-nonweak-archives -Z -L%t %t/weakfoo.a %t/foo.a %t/test.o +# RUN: %lld -lSystem -o %t/weak-nonweak-archives -L%t %t/weakfoo.a %t/foo.a %t/test.o # RUN: llvm-objdump --syms %t/weak-nonweak-archives | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-weak-archives -Z -L%t %t/foo.a %t/weakfoo.a %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-weak-archives -L%t %t/foo.a %t/weakfoo.a %t/test.o # RUN: llvm-objdump --syms %t/nonweak-weak-archives | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-nonweak-objs -Z -L%t %t/weakfoo.o %t/foo.o %t/test.o +# RUN: %lld -lSystem -o %t/weak-nonweak-objs -L%t %t/weakfoo.o %t/foo.o %t/test.o # RUN: llvm-objdump --syms %t/weak-nonweak-objs | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-weak-objs -Z -L%t %t/foo.o %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-weak-objs -L%t %t/foo.o %t/weakfoo.o %t/test.o # RUN: llvm-objdump --syms %t/nonweak-weak-objs | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-obj-nonweak-ar -Z -L%t %t/weakfoo.o %t/foo.a %t/test.o +# RUN: %lld -lSystem -o %t/weak-obj-nonweak-ar -L%t %t/weakfoo.o %t/foo.a %t/test.o # RUN: llvm-objdump --syms %t/weak-obj-nonweak-ar | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-ar-weak-obj -Z -L%t %t/foo.a %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-ar-weak-obj -L%t %t/foo.a %t/weakfoo.o %t/test.o # RUN: llvm-objdump --syms %t/nonweak-ar-weak-obj | FileCheck %s --check-prefix=PREFER-NONWEAK-OBJECT .globl _main diff --git a/lld/test/MachO/weak-definition-order.s b/lld/test/MachO/weak-definition-order.s index b3b23c8..01875e82 100644 --- a/lld/test/MachO/weak-definition-order.s +++ b/lld/test/MachO/weak-definition-order.s @@ -9,22 +9,22 @@ # RUN: echo ".globl _foo; .weak_definition _foo; .section __TEXT,weak1; _foo:" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/weak1.o # RUN: echo ".globl _foo; .weak_definition _foo; .section __TEXT,weak2; _foo:" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/weak2.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/obj12 -Z -L%t %t/weak1.o %t/weak2.o %t/test.o +# RUN: %lld -lSystem -o %t/obj12 -L%t %t/weak1.o %t/weak2.o %t/test.o # RUN: llvm-objdump --syms %t/obj12 | FileCheck %s --check-prefix=WEAK1 -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/obj21 -Z -L%t %t/weak2.o %t/weak1.o %t/test.o +# RUN: %lld -lSystem -o %t/obj21 -L%t %t/weak2.o %t/weak1.o %t/test.o # RUN: llvm-objdump --syms %t/obj21 | FileCheck %s --check-prefix=WEAK2 # WEAK1: O __TEXT,weak1 _foo # WEAK2: O __TEXT,weak2 _foo -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libweak1.dylib %t/weak1.o -o %t/libweak1.dylib -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libweak2.dylib %t/weak2.o -o %t/libweak2.dylib -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/dylib12 -Z -L%t -lweak1 -lweak2 %t/test.o +# RUN: %lld -lSystem -o %t/dylib12 -L%t -lweak1 -lweak2 %t/test.o # RUN: llvm-objdump --macho --bind %t/dylib12 | FileCheck %s --check-prefix=DYLIB1 -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/dylib21 -Z -L%t -lweak2 -lweak1 %t/test.o +# RUN: %lld -lSystem -o %t/dylib21 -L%t -lweak2 -lweak1 %t/test.o # RUN: llvm-objdump --macho --bind %t/dylib21 | FileCheck %s --check-prefix=DYLIB2 # DYLIB1: __DATA __la_symbol_ptr 0x{{[0-9a-f]*}} pointer 0 libweak1 _foo # DYLIB2: __DATA __la_symbol_ptr 0x{{[0-9a-f]*}} pointer 0 libweak2 _foo diff --git a/lld/test/MachO/weak-definition-over-dysym.s b/lld/test/MachO/weak-definition-over-dysym.s index e3cf030..ec1f335 100644 --- a/lld/test/MachO/weak-definition-over-dysym.s +++ b/lld/test/MachO/weak-definition-over-dysym.s @@ -7,7 +7,7 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o # RUN: echo ".globl _foo; _foo:" | llvm-mc -filetype=obj -triple=x86_64-apple-darwin -o %t/libfoo.o -# RUN: lld -flavor darwinnew -dylib -install_name \ +# RUN: %lld -dylib -install_name \ # RUN: @executable_path/libfoo.dylib %t/libfoo.o -o %t/libfoo.dylib # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/test.o @@ -22,14 +22,14 @@ # PREFER-WEAK-OBJECT: O __TEXT,weak _foo # PREFER-NONWEAK-OBJECT: O __TEXT,nonweak _foo -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-dylib-weak-ar -Z -L%t -lfoo %t/weakfoo.a %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-dylib-weak-ar -L%t -lfoo %t/weakfoo.a %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-dylib-weak-ar | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-ar-nonweak-dylib -Z -L%t %t/weakfoo.a -lfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-ar-nonweak-dylib -L%t %t/weakfoo.a -lfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-ar-nonweak-dylib | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/weak-obj-nonweak-dylib -Z -L%t %t/weakfoo.o -lfoo %t/test.o +# RUN: %lld -lSystem -o %t/weak-obj-nonweak-dylib -L%t %t/weakfoo.o -lfoo %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/weak-obj-nonweak-dylib | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -o %t/nonweak-dylib-weak-obj -Z -L%t -lfoo %t/weakfoo.o %t/test.o +# RUN: %lld -lSystem -o %t/nonweak-dylib-weak-obj -L%t -lfoo %t/weakfoo.o %t/test.o # RUN: llvm-objdump --macho --lazy-bind --syms %t/nonweak-dylib-weak-obj | FileCheck %s --check-prefix=PREFER-WEAK-OBJECT .globl _main diff --git a/lld/test/MachO/weak-header-flags.s b/lld/test/MachO/weak-header-flags.s index eb799cd..6ea61af 100644 --- a/lld/test/MachO/weak-header-flags.s +++ b/lld/test/MachO/weak-header-flags.s @@ -2,15 +2,15 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libweak-defines.s -o %t/libweak-defines.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -dylib %t/libweak-defines.o -o %t/libweak-defines.dylib +# RUN: %lld -dylib %t/libweak-defines.o -o %t/libweak-defines.dylib # RUN: llvm-readobj --file-headers %t/libweak-defines.dylib | FileCheck %s --check-prefix=WEAK-DEFINES-AND-BINDS # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/binds-to-weak.s -o %t/binds-to-weak.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -L%t -lweak-defines -o %t/binds-to-weak %t/binds-to-weak.o +# RUN: %lld -lSystem -L%t -lweak-defines -o %t/binds-to-weak %t/binds-to-weak.o # RUN: llvm-readobj --file-headers %t/binds-to-weak | FileCheck %s --check-prefix=WEAK-BINDS-ONLY # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/overrides-weak.s -o %t/overrides-weak.o -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -lSystem -L%t -lweak-defines -o %t/overrides-weak %t/overrides-weak.o +# RUN: %lld -lSystem -L%t -lweak-defines -o %t/overrides-weak %t/overrides-weak.o # RUN: llvm-readobj --file-headers %t/overrides-weak | FileCheck %s --check-prefix=WEAK-DEFINES-ONLY # WEAK-DEFINES-AND-BINDS: MH_BINDS_TO_WEAK diff --git a/lld/test/MachO/weak-import.s b/lld/test/MachO/weak-import.s index a203375..81e0a9e 100644 --- a/lld/test/MachO/weak-import.s +++ b/lld/test/MachO/weak-import.s @@ -2,9 +2,9 @@ # RUN: split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -lSystem -dylib %t/foo.o -o %t/libfoo.dylib +# RUN: %lld -lSystem -dylib %t/foo.o -o %t/libfoo.dylib -# RUN: lld -flavor darwinnew -syslibroot %S/Inputs/MacOSX.sdk -weak-lSystem %t/test.o -weak_framework CoreFoundation -weak_library %t/libfoo.dylib -o %t/test +# RUN: %lld -weak-lSystem %t/test.o -weak_framework CoreFoundation -weak_library %t/libfoo.dylib -o %t/test # RUN: llvm-objdump --macho --all-headers %t/test | FileCheck %s -DDIR=%t # CHECK: cmd LC_LOAD_WEAK_DYLIB diff --git a/lld/test/MachO/x86-64-reloc-got-load.s b/lld/test/MachO/x86-64-reloc-got-load.s index 158936d0b..2369334 100644 --- a/lld/test/MachO/x86-64-reloc-got-load.s +++ b/lld/test/MachO/x86-64-reloc-got-load.s @@ -4,7 +4,7 @@ ## Note: GOT_LOAD relocations to dylib symbols are already tested in dylink.s. # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # CHECK: leaq [[#]](%rip), %rax # {{.*}} <_foo> diff --git a/lld/test/MachO/x86-64-reloc-signed.s b/lld/test/MachO/x86-64-reloc-signed.s index 568f65c..b74124d 100644 --- a/lld/test/MachO/x86-64-reloc-signed.s +++ b/lld/test/MachO/x86-64-reloc-signed.s @@ -1,6 +1,6 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-objdump -D %t | FileCheck %s # CHECK: <_main>: diff --git a/lld/test/MachO/x86-64-reloc-unsigned.s b/lld/test/MachO/x86-64-reloc-unsigned.s index b88f3ee..e3608f3 100644 --- a/lld/test/MachO/x86-64-reloc-unsigned.s +++ b/lld/test/MachO/x86-64-reloc-unsigned.s @@ -1,9 +1,9 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: lld -flavor darwinnew -o %t %t.o +# RUN: %lld -o %t %t.o # RUN: llvm-objdump --macho --rebase --full-contents %t | FileCheck %s -# RUN: lld -flavor darwinnew -pie -o %t-pie %t.o +# RUN: %lld -pie -o %t-pie %t.o # RUN: llvm-objdump --macho --rebase %t-pie | FileCheck %s --check-prefix=PIE # CHECK: Contents of section __DATA,foo: |