[lld] r268275 - Attempt to fix Windows bots.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Mon May 2 11:16:14 PDT 2016


Author: ruiu
Date: Mon May  2 13:16:14 2016
New Revision: 268275

URL: http://llvm.org/viewvc/llvm-project?rev=268275&view=rev
Log:
Attempt to fix Windows bots.

Modified:
    lld/trunk/ELF/DriverUtils.cpp
    lld/trunk/test/ELF/reproduce.s

Modified: lld/trunk/ELF/DriverUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/DriverUtils.cpp?rev=268275&r1=268274&r2=268275&view=diff
==============================================================================
--- lld/trunk/ELF/DriverUtils.cpp (original)
+++ lld/trunk/ELF/DriverUtils.cpp Mon May  2 13:16:14 2016
@@ -100,7 +100,7 @@ static std::string relativeToRoot(String
   // (e.g. "c:") or a UNC name (//net). We want to keep it as part
   // of the result.
   SmallString<128> Res;
-  StringRef Root = path::root_name(Path);
+  StringRef Root = path::root_name(Abs);
   if (Root.endswith(":"))
     Res = Root.drop_back();
   else if (Root.startswith("//"))

Modified: lld/trunk/test/ELF/reproduce.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/reproduce.s?rev=268275&r1=268274&r2=268275&view=diff
==============================================================================
--- lld/trunk/test/ELF/reproduce.s (original)
+++ lld/trunk/test/ELF/reproduce.s Mon May  2 13:16:14 2016
@@ -9,8 +9,8 @@
 
 # RUN: FileCheck %s --check-prefix=RSP < repro/response.txt
 # RSP: {{^}}--hash-style gnu{{$}}
-# RSP-NOT: repro/
-# RSP-NEXT: /foo.o
+# RSP-NOT: repro{{[/\\]}}
+# RSP-NEXT: {{[/\\]}}foo.o
 # RSP-NEXT: -o bar
 # RSP-NEXT: -shared
 # RSP-NEXT: --as-needed




More information about the llvm-commits mailing list