maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld-macho] Ignore -platform_version and -syslibroot flags. 

clang passes these flags; this makes it easier to try `clang -v`
output with `ld -flavor darwinnew`.

Differential Revision: https://reviews.llvm.org/D79797
This commit is contained in:
Nico Weber 2020-05-12 14:02:13 -04:00
parent e17a47b2d3
commit 759bae956a
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lld/MachO/Driver.cpp
View File

@ -131,6 +131,18 @@ static bool markSubLibrary(StringRef searchName) {
return false;
}
static void handlePlatformVersion(opt::ArgList::iterator &it,
const opt::ArgList::iterator &end) {
// -platform_version takes 3 args, which LLVM's option library doesn't
// support directly. So this explicitly handles that.
// FIXME: stash skipped args for later use.
for (int i = 0; i < 3; ++i) {
++it;
if (it == end || (*it)->getOption().getID() != OPT_INPUT)
fatal("usage: -platform_version platform min_version sdk_version");
}
}
bool macho::link(llvm::ArrayRef<const char *> argsArr, bool canExitEarly,
raw_ostream &stdoutOS, raw_ostream &stderrOS) {
lld::stdoutOS = &stdoutOS;
@ -162,7 +174,9 @@ bool macho::link(llvm::ArrayRef<const char *> argsArr, bool canExitEarly,
return !errorCount();
}
for (opt::Arg *arg : args) {
for (opt::ArgList::iterator it = args.begin(), end = args.end(); it != end;
++it) {
const opt::Arg *arg = *it;
switch (arg->getOption().getID()) {
case OPT_INPUT:
addFile(arg->getValue());
@ -171,6 +185,10 @@ bool macho::link(llvm::ArrayRef<const char *> argsArr, bool canExitEarly,
if (Optional<std::string> path = findDylib(arg->getValue()))
addFile(*path);
break;
case OPT_platform_version: {
handlePlatformVersion(it, end); // Can advance "it".
break;
}
}
}

2
lld/MachO/Options.td
View File

@ -32,5 +32,7 @@ def v: Flag<["-"], "v">, HelpText<"Display the version number and exit">;
def: Flag<["-"], "demangle">;
def: Flag<["-"], "dynamic">;
def: Flag<["-"], "no_deduplicate">;
def platform_version: Flag<["-"], "platform_version">;
def: Separate<["-"], "lto_library">;
def: Separate<["-"], "macosx_version_min">;
def: Separate<["-"], "syslibroot">;

16
lld/test/MachO/platform-version.test Normal file
View File

@ -0,0 +1,16 @@
# RUN: not lld -flavor darwinnew -platform_version 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL %s
# RUN: not lld -flavor darwinnew -platform_version macos 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL %s
# RUN: not lld -flavor darwinnew -platform_version macos 10.15 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL %s
# RUN: not lld -flavor darwinnew -platform_version macos -lfoo 10.15 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL %s
# RUN: not lld -flavor darwinnew -platform_version macos 10.15 10.15.4 2>&1 \
# RUN: | FileCheck --check-prefix=GOOD %s
# RUN: not lld -flavor darwinnew -platform_version macos 10.15 10.15.4 foobar 2>&1 \
# RUN: | FileCheck --check-prefix=FAIL_FILE %s
FAIL: usage: -platform_version platform min_version sdk_version
GOOD: undefined symbol: _main
FAIL_FILE: cannot open foobar

3
lld/test/MachO/silent-ignore.test
View File

@ -3,6 +3,7 @@ RUN: -demangle \
RUN: -dynamic \
RUN: -no_deduplicate \
RUN: -lto_library /lib/foo \
RUN: -macosx_version_min 0
RUN: -macosx_version_min 0 \
RUN: -syslibroot /path/to/MacOSX.platform/Developer/SDKs/MacOSX.sdk
RUN: not lld -flavor darwinnew -v --not-an-ignored-argument 2>&1 | FileCheck %s
CHECK: error: unknown argument: --not-an-ignored-argument