From: Greg McGary Date: Sun, 20 Sep 2020 15:37:20 +0000 (-0700) Subject: [lld-macho] handle options -search_paths_first, -search_dylibs_first X-Git-Tag: llvmorg-13-init~11111 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f2c31f22b974da2c0fbc5de0ce4dceffe8ed0b8;p=platform%2Fupstream%2Fllvm.git [lld-macho] handle options -search_paths_first, -search_dylibs_first Differential Revision: https://reviews.llvm.org/D88054 --- diff --git a/lld/MachO/Config.h b/lld/MachO/Config.h index 447a0c3..f6b61d0 100644 --- a/lld/MachO/Config.h +++ b/lld/MachO/Config.h @@ -37,6 +37,7 @@ struct Configuration { bool forceLoadObjC = false; bool staticLink = false; bool headerPadMaxInstallNames = false; + bool searchDylibsFirst = false; uint32_t headerPad; llvm::StringRef installName; llvm::StringRef outputFile; diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp index c098e7e..a6e2f5c 100644 --- a/lld/MachO/Driver.cpp +++ b/lld/MachO/Driver.cpp @@ -88,26 +88,29 @@ void MachOOptTable::printHelp(const char *argv0, bool showHidden) const { lld::outs() << "\n"; } -static Optional findWithExtension(StringRef base, - ArrayRef extensions) { - for (StringRef ext : extensions) { - Twine location = base + ext; - if (fs::exists(location)) - return location.str(); +static Optional +findAlongPathsWithExtensions(StringRef name, ArrayRef extensions) { + llvm::SmallString<261> base; + for (StringRef dir : config->librarySearchPaths) { + base = dir; + path::append(base, Twine("lib") + name); + for (StringRef ext : extensions) { + Twine location = base + ext; + if (fs::exists(location)) + return location.str(); + } } return {}; } static Optional findLibrary(StringRef name) { - llvm::SmallString<261> location; - for (StringRef dir : config->librarySearchPaths) { - location = dir; - path::append(location, Twine("lib") + name); - if (Optional path = - findWithExtension(location, {".tbd", ".dylib", ".a"})) - return path; + if (config->searchDylibsFirst) { + if (Optional path = + findAlongPathsWithExtensions(name, {".tbd", ".dylib"})) + return path; + return findAlongPathsWithExtensions(name, {".a"}); } - return {}; + return findAlongPathsWithExtensions(name, {".tbd", ".dylib", ".a"}); } static Optional findFramework(StringRef name) { @@ -543,6 +546,10 @@ bool macho::link(llvm::ArrayRef argsArr, bool canExitEarly, getLibrarySearchPaths(args, roots, config->librarySearchPaths); getFrameworkSearchPaths(args, roots, config->frameworkSearchPaths); + if (const opt::Arg *arg = + args.getLastArg(OPT_search_paths_first, OPT_search_dylibs_first)) + config->searchDylibsFirst = + (arg && arg->getOption().getID() == OPT_search_dylibs_first); config->forceLoadObjC = args.hasArg(OPT_ObjC); if (args.hasArg(OPT_v)) { diff --git a/lld/MachO/Options.td b/lld/MachO/Options.td index 602f723..ac6424b 100644 --- a/lld/MachO/Options.td +++ b/lld/MachO/Options.td @@ -104,11 +104,9 @@ def syslibroot : Separate<["-"], "syslibroot">, Group; def search_paths_first : Flag<["-"], "search_paths_first">, HelpText<"Search for lib.dylib and lib.a at each step in traversing search path (default for Xcode 4 and later)">, - Flags<[HelpHidden]>, Group; def search_dylibs_first : Flag<["-"], "search_dylibs_first">, HelpText<"Search for lib.dylib on first pass, then for lib.a on second pass through search path (default for Xcode 3 and earlier)">, - Flags<[HelpHidden]>, Group; def framework : Separate<["-"], "framework">, MetaVarName<"">, diff --git a/lld/test/MachO/link-search-order.s b/lld/test/MachO/link-search-order.s index 9819e17..3e8803b 100644 --- a/lld/test/MachO/link-search-order.s +++ b/lld/test/MachO/link-search-order.s @@ -1,22 +1,57 @@ # REQUIRES: x86 -# RUN: mkdir -p %t +################ Place dynlib in %tD, and archive in %tA +# 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: 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 %t/libgoodbye.dylib -# RUN: llvm-ar --format=darwin crs %t/libgoodbye.a %t/goodbye.o +# RUN: lld -flavor darwinnew -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 -# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z -L%t -lhello -lgoodbye -lSystem %t/test.o -# -# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck %s -# CHECK: @executable_path/libhello.dylib -# CHECK: @executable_path/libgoodbye.dylib -# CHECK: /usr/lib/libSystem.B.dylib +################ 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: -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: -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: -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: -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: -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: -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: -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: -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: -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 + +# DYLIB: @executable_path/libhello.dylib +# DYLIB: @executable_path/libgoodbye.dylib +# DYLIB: /usr/lib/libSystem.B.dylib + +# ARCHIVE: @executable_path/libhello.dylib +# ARCHIVE-NOT: @executable_path/libgoodbye.dylib +# ARCHIVE: /usr/lib/libSystem.B.dylib .section __TEXT,__text .global _main