Date: Sun, 2 Aug 2020 18:34:29 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363779 - projects/clang1100-import/contrib/llvm-project/lld/tools/lld Message-ID: <202008021834.072IYTWK078064@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Aug 2 18:34:29 2020 New Revision: 363779 URL: https://svnweb.freebsd.org/changeset/base/363779 Log: Reapply r327026 (partially): Merge lld trunk r321017 to contrib/llvm/tools/lld. (Note that in this merge, I foolishly combined upstream changes with this local change. But only this ifdef part is really needed, as we always default to ELF link mode.) Modified: projects/clang1100-import/contrib/llvm-project/lld/tools/lld/lld.cpp Modified: projects/clang1100-import/contrib/llvm-project/lld/tools/lld/lld.cpp ============================================================================== --- projects/clang1100-import/contrib/llvm-project/lld/tools/lld/lld.cpp Sun Aug 2 18:30:29 2020 (r363778) +++ projects/clang1100-import/contrib/llvm-project/lld/tools/lld/lld.cpp Sun Aug 2 18:34:29 2020 (r363779) @@ -142,6 +142,9 @@ int main(int argc, const char **argv) { InitLLVM x(argc, argv); std::vector<const char *> args(argv, argv + argc); +#ifdef __FreeBSD__ + return !elf::link(args, canExitEarly(), llvm::outs(), llvm::errs()); +#else switch (parseFlavor(args)) { case Gnu: if (isPETarget(args)) @@ -160,4 +163,5 @@ int main(int argc, const char **argv) { "Invoke ld.lld (Unix), ld64.lld (macOS), lld-link (Windows), wasm-ld" " (WebAssembly) instead"); } +#endif }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008021834.072IYTWK078064>