<div dir="ltr">Hello Nico,<br><br>This commit broke tests on few our builders:<br><br><a href="http://lab.llvm.org:8011/builders/lld-x86_64-win7/builds/26435">http://lab.llvm.org:8011/builders/lld-x86_64-win7/builds/26435</a><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/19298">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/19298</a><br>. . .<br>Failing Tests (1):<br> lld :: ELF/lto-plugin-ignore.s<br><br>Please have a look?<br>Buildbot did not sent notifications on this. I am looking into this issue.<br><br>Thanks<br><br>Galina<br></div><br><div class="gmail_quote"><div dir="ltr">On Wed, Aug 22, 2018 at 4:53 PM Nico Weber via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: nico<br>
Date: Wed Aug 22 16:52:13 2018<br>
New Revision: 340487<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=340487&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=340487&view=rev</a><br>
Log:<br>
win: Omit ".exe" from lld warning and error messages.<br>
<br>
This is a minor follow-up to <a href="https://reviews.llvm.org/D49189" rel="noreferrer" target="_blank">https://reviews.llvm.org/D49189</a>. On Windows, lld<br>
used to print "lld-link.exe: error: ...". Now it just prints "lld-link: error:<br>
...". This matches what link.exe does (it prints "LINK : ...") and makes lld's<br>
output less dependent on the host system.<br>
<br>
<a href="https://reviews.llvm.org/D51133" rel="noreferrer" target="_blank">https://reviews.llvm.org/D51133</a><br>
<br>
Modified:<br>
lld/trunk/COFF/Driver.cpp<br>
lld/trunk/Common/Args.cpp<br>
lld/trunk/ELF/Driver.cpp<br>
lld/trunk/include/lld/Common/Args.h<br>
lld/trunk/lib/Driver/DarwinLdDriver.cpp<br>
lld/trunk/test/ELF/lto-plugin-ignore.s<br>
lld/trunk/wasm/Driver.cpp<br>
<br>
Modified: lld/trunk/COFF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/COFF/Driver.cpp (original)<br>
+++ lld/trunk/COFF/Driver.cpp Wed Aug 22 16:52:13 2018<br>
@@ -56,7 +56,7 @@ Configuration *Config;<br>
LinkerDriver *Driver;<br>
<br>
bool link(ArrayRef<const char *> Args, bool CanExitEarly, raw_ostream &Diag) {<br>
- errorHandler().LogName = sys::path::filename(Args[0]);<br>
+ errorHandler().LogName = args::FilenameWithoutExe(Args[0]);<br>
errorHandler().ErrorOS = &Diag;<br>
errorHandler().ColorDiagnostics = Diag.has_colors();<br>
errorHandler().ErrorLimitExceededMsg =<br>
<br>
Modified: lld/trunk/Common/Args.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/Common/Args.cpp?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/Common/Args.cpp?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/Common/Args.cpp (original)<br>
+++ lld/trunk/Common/Args.cpp Wed Aug 22 16:52:13 2018<br>
@@ -13,6 +13,7 @@<br>
#include "llvm/ADT/StringExtras.h"<br>
#include "llvm/ADT/StringRef.h"<br>
#include "llvm/Option/ArgList.h"<br>
+#include "llvm/Support/Path.h"<br>
<br>
using namespace llvm;<br>
using namespace lld;<br>
@@ -64,3 +65,9 @@ std::vector<StringRef> lld::args::getLin<br>
}<br>
return Ret;<br>
}<br>
+<br>
+StringRef lld::args::FilenameWithoutExe(StringRef Path) {<br>
+ if (Path.endswith_lower(".exe"))<br>
+ return sys::path::stem(Path);<br>
+ return sys::path::filename(Path);<br>
+}<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Wed Aug 22 16:52:13 2018<br>
@@ -74,7 +74,7 @@ static void setConfigs(opt::InputArgList<br>
<br>
bool elf::link(ArrayRef<const char *> Args, bool CanExitEarly,<br>
raw_ostream &Error) {<br>
- errorHandler().LogName = sys::path::filename(Args[0]);<br>
+ errorHandler().LogName = args::FilenameWithoutExe(Args[0]);<br>
errorHandler().ErrorLimitExceededMsg =<br>
"too many errors emitted, stopping now (use "<br>
"-error-limit=0 to see all errors)";<br>
<br>
Modified: lld/trunk/include/lld/Common/Args.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Common/Args.h?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Common/Args.h?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/Common/Args.h (original)<br>
+++ lld/trunk/include/lld/Common/Args.h Wed Aug 22 16:52:13 2018<br>
@@ -29,6 +29,9 @@ uint64_t getZOptionValue(llvm::opt::Inpu<br>
uint64_t Default);<br>
<br>
std::vector<StringRef> getLines(MemoryBufferRef MB);<br>
+<br>
+StringRef FilenameWithoutExe(StringRef Path);<br>
+<br>
} // namespace args<br>
} // namespace lld<br>
<br>
<br>
Modified: lld/trunk/lib/Driver/DarwinLdDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinLdDriver.cpp?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinLdDriver.cpp?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/Driver/DarwinLdDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/DarwinLdDriver.cpp Wed Aug 22 16:52:13 2018<br>
@@ -1143,7 +1143,7 @@ static void createFiles(MachOLinkingCont<br>
/// This is where the link is actually performed.<br>
bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly,<br>
raw_ostream &Error) {<br>
- errorHandler().LogName = llvm::sys::path::filename(args[0]);<br>
+ errorHandler().LogName = args::FilenameWithoutExe(args[0]);<br>
errorHandler().ErrorLimitExceededMsg =<br>
"too many errors emitted, stopping now (use "<br>
"'-error-limit 0' to see all errors)";<br>
<br>
Modified: lld/trunk/test/ELF/lto-plugin-ignore.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto-plugin-ignore.s?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto-plugin-ignore.s?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/lto-plugin-ignore.s (original)<br>
+++ lld/trunk/test/ELF/lto-plugin-ignore.s Wed Aug 22 16:52:13 2018<br>
@@ -6,5 +6,5 @@<br>
# RUN: -plugin-opt=-data-sections -plugin-opt=thinlto -o /dev/null<br>
<br>
# RUN: not ld.lld %t -plugin-opt=-abc -plugin-opt=-xyz 2>&1 | FileCheck %s<br>
-# CHECK: error: --plugin-opt: ld.lld{{.*}}: Unknown command line argument '-abc'<br>
-# CHECK: error: --plugin-opt: ld.lld{{.*}}: Unknown command line argument '-xyz'<br>
+# CHECK: error: --plugin-opt: ld.lld: Unknown command line argument '-abc'<br>
+# CHECK: error: --plugin-opt: ld.lld: Unknown command line argument '-xyz'<br>
<br>
Modified: lld/trunk/wasm/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Driver.cpp?rev=340487&r1=340486&r2=340487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Driver.cpp?rev=340487&r1=340486&r2=340487&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/wasm/Driver.cpp (original)<br>
+++ lld/trunk/wasm/Driver.cpp Wed Aug 22 16:52:13 2018<br>
@@ -78,7 +78,7 @@ private:<br>
<br>
bool lld::wasm::link(ArrayRef<const char *> Args, bool CanExitEarly,<br>
raw_ostream &Error) {<br>
- errorHandler().LogName = sys::path::filename(Args[0]);<br>
+ errorHandler().LogName = args::FilenameWithoutExe(Args[0]);<br>
errorHandler().ErrorOS = &Error;<br>
errorHandler().ColorDiagnostics = Error.has_colors();<br>
errorHandler().ErrorLimitExceededMsg =<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>