diff options
| -rw-r--r-- | lld/ELF/Driver.cpp | 26 | ||||
| -rw-r--r-- | lld/test/ELF/driver.test | 2 |
2 files changed, 22 insertions, 6 deletions
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index d2c8f338fa3..470325f4161 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -300,11 +300,27 @@ void LinkerDriver::main(ArrayRef<const char *> ArgsArr, bool CanExitEarly) { return; } - // GNU linkers disagree here. Though both -version and -v are mentioned - // in help to print the version information, GNU ld just normally exits, - // while gold can continue linking. We are compatible with ld.bfd here. - if (Args.hasArg(OPT_version) || Args.hasArg(OPT_v)) - message(getLLDVersion()); + // Handle -v or -version. + // + // A note about "compatible with GNU linkers" message: this is a hack for + // scripts generated by GNU Libtool 2.4.6 (released in February 2014 and + // still the newest version in March 2017) or earlier to recognize LLD as + // a GNU compatible linker. As long as an output for the -v option + // contains "GNU" or "with BFD", they recognize us as GNU-compatible. + // + // This is somewhat ugly hack, but in reality, we had no choice other + // than doing this. Considering the very long release cycle of Libtool, + // it is not easy to improve it to recognize LLD as a GNU compatible + // linker in a timely manner. Even if we can make it, there are still a + // lot of "configure" scripts out there that are generated by old version + // of Libtool. We cannot convince every software developer to migrate to + // the latest version and re-generate scripts. So we have this hack. + if (Args.hasArg(OPT_v) || Args.hasArg(OPT_version)) + message(getLLDVersion() + " (compatible with GNU linkers)"); + + // ld.bfd always exits after printing out the version string. + // ld.gold proceeds if a given option is -v. Because gold's behavior + // is more permissive than ld.bfd, we chose what gold does here. if (Args.hasArg(OPT_version)) return; diff --git a/lld/test/ELF/driver.test b/lld/test/ELF/driver.test index 547cb562761..3ce0efc92b2 100644 --- a/lld/test/ELF/driver.test +++ b/lld/test/ELF/driver.test @@ -17,7 +17,7 @@ # HELP: USAGE: # RUN: ld.lld --version 2>&1 | FileCheck -check-prefix=VERSION %s -# VERSION: LLD +# VERSION: LLD {{.*}} (compatible with GNU linkers) # RUN: not ld.lld -v 2>&1 | FileCheck -check-prefix=VERSION %s |
