Skip to content

Commit ab45289

Browse files
committed
[lld/mac] Make -v print version and search paths in additon to linking, not instead of linking
This matches ld64's behavior. Differential Revision: https://reviews.llvm.org/D97718
1 parent bacacb9 commit ab45289

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

lld/MachO/Driver.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,6 @@ bool macho::link(ArrayRef<const char *> argsArr, bool canExitEarly,
847847
(config->frameworkSearchPaths.size()
848848
? "\n\t" + join(config->frameworkSearchPaths, "\n\t")
849849
: ""));
850-
freeArena();
851-
return !errorCount();
852850
}
853851

854852
initLLVM(); // must be run before any call to addFile()

lld/MachO/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ def bitcode_symbol_map : Separate<["-"], "bitcode_symbol_map">,
564564
def grp_rare : OptionGroup<"rare">, HelpText<"RARELY USED">;
565565

566566
def v : Flag<["-"], "v">,
567-
HelpText<"Print the linker version and search paths and exit">,
567+
HelpText<"Print the linker version and search paths in addition to linking">,
568568
Group<grp_rare>;
569569
def adhoc_codesign : Flag<["-"], "adhoc_codesign">,
570570
HelpText<"Write an ad-hoc code signature to the output file.">,

lld/test/MachO/silent-ignore.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RUN: %lld -v \
1+
RUN: %lld --version \
22
RUN: -dynamic \
33
RUN: -no_deduplicate \
44
RUN: -lto_library /lib/foo \

lld/test/MachO/syslibroot.test

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
# Ensure that a nonexistent path is ignored with a syslibroot
22

3-
RUN: ld64.lld -v -syslibroot /var/empty | FileCheck %s -check-prefix CHECK-NONEXISTENT-SYSLIBROOT
3+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot /var/empty | FileCheck %s -check-prefix CHECK-NONEXISTENT-SYSLIBROOT
44

55
CHECK-NONEXISTENT-SYSLIBROOT: Library search paths:
66
CHECK-NONEXISTENT-SYSLIBROOT-NEXT: Framework search paths:
77

88
RUN: mkdir -p %t/usr/lib
9-
RUN: ld64.lld -v -syslibroot %t 2>&1 | FileCheck %s -check-prefix CHECK-SYSLIBROOT -DROOT=%t
9+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t 2>&1 | FileCheck %s -check-prefix CHECK-SYSLIBROOT -DROOT=%t
1010

1111
CHECK-SYSLIBROOT-NOT: directory not found{{.*}}usr/local/lib
1212
CHECK-SYSLIBROOT: Library search paths:
1313
CHECK-SYSLIBROOT-NEXT: [[ROOT]]/usr/lib
1414

1515
RUN: mkdir -p %t/Library/libxml2-development
16-
RUN: ld64.lld -v -syslibroot %t -L /Library/libxml2-development | FileCheck %s -check-prefix CHECK-ABSOLUTE-PATH-REROOTED -DROOT=%t
16+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t -L /Library/libxml2-development | FileCheck %s -check-prefix CHECK-ABSOLUTE-PATH-REROOTED -DROOT=%t
1717

1818
CHECK-ABSOLUTE-PATH-REROOTED: Library search paths:
1919
CHECK-ABSOLUTE-PATH-REROOTED: [[ROOT]]/Library/libxml2-development
2020
CHECK-ABSOLUTE-PATH-REROOTED: [[ROOT]]/usr/lib
2121

22-
RUN: ld64.lld -v -syslibroot %t -L %t/Library/libxml2-development | FileCheck %s -check-prefix CHECK-PATH-WITHOUT-REROOT -DPATH=%t/Library/libxml2-development
22+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t -L %t/Library/libxml2-development | FileCheck %s -check-prefix CHECK-PATH-WITHOUT-REROOT -DPATH=%t/Library/libxml2-development
2323
CHECK-PATH-WITHOUT-REROOT: Library search paths:
2424
CHECK-PATH-WITHOUT-REROOT-NEXT: [[PATH]]
2525

2626
RUN: mkdir -p %t.2/usr/lib
27-
RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 | FileCheck %s -check-prefix CHECK-SYSLIBROOT-MATRIX -DROOT=%t
27+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t -syslibroot %t.2 | FileCheck %s -check-prefix CHECK-SYSLIBROOT-MATRIX -DROOT=%t
2828

2929
CHECK-SYSLIBROOT-MATRIX: Library search paths:
3030
CHECK-SYSLIBROOT-MATRIX: [[ROOT]]/usr/lib
3131
CHECK-SYSLIBROOT-MATRIX: [[ROOT]].2/usr/lib
3232

33-
RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 -syslibroot / | FileCheck %s -check-prefix CHECK-SYSLIBROOT-IGNORED -DROOT=%t
33+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t -syslibroot %t.2 -syslibroot / | FileCheck %s -check-prefix CHECK-SYSLIBROOT-IGNORED -DROOT=%t
3434

3535
CHECK-SYSLIBROOT-IGNORED: Library search paths:
3636
CHECK-SYSLIBROOT-IGNORED-NOT: [[ROOT]]/usr/lib
3737
CHECK-SYSLIBROOT-IGNORED-NOT: [[ROOT]].2/usr/lib
3838

3939
RUN: mkdir -p %t/System/Library/Frameworks
40-
RUN: ld64.lld -v -syslibroot %t | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK -DROOT=%t
40+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK -DROOT=%t
4141

4242
CHECK-SYSLIBROOT-FRAMEWORK: Framework search paths:
4343
CHECK-SYSLIBROOT-FRAMEWORK: [[ROOT]]/System/Library/Frameworks
4444

4545
RUN: mkdir -p %t/Library/Frameworks
4646
RUN: mkdir -p %t.2/Library/Frameworks
47-
RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-MATRIX -DROOT=%t
47+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t -syslibroot %t.2 -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-MATRIX -DROOT=%t
4848

4949
CHECK-SYSLIBROOT-FRAMEWORK-MATRIX: Framework search paths:
5050
CHECK-SYSLIBROOT-FRAMEWORK-MATRIX: [[ROOT]]/Library/Frameworks
5151
CHECK-SYSLIBROOT-FRAMEWORK-MATRIX: [[ROOT]].2/Library/Frameworks
5252

53-
RUN: ld64.lld -v -syslibroot %t -syslibroot %t.2 -syslibroot / -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-IGNORED -DROOT=%t
53+
RUN: ld64.lld -v -dylib -o /dev/null -syslibroot %t -syslibroot %t.2 -syslibroot / -F /Library/Frameworks | FileCheck %s -check-prefix CHECK-SYSLIBROOT-FRAMEWORK-IGNORED -DROOT=%t
5454

5555
CHECK-SYSLIBROOT-FRAMEWORK-IGNORED: Framework search paths:
5656
CHECK-SYSLIBROOT-FRAMEWORK-IGNORED-NOT: [[ROOT]]/Library/Frameworks

0 commit comments

Comments
 (0)