summaryrefslogtreecommitdiff
path: root/tools/llvm-link
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-06-17 17:32:19 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-06-17 17:32:19 +0000
commitd5bf07b4667c7381fcd375b186e95436b32b90e6 (patch)
tree2bc6a1f5055853d2b79d40de4de6fed28b6addee /tools/llvm-link
parent7459ff4be22e92efdd89884a7c2a0ca63904998d (diff)
downloadllvm-d5bf07b4667c7381fcd375b186e95436b32b90e6.tar.gz
llvm-d5bf07b4667c7381fcd375b186e95436b32b90e6.tar.bz2
llvm-d5bf07b4667c7381fcd375b186e95436b32b90e6.tar.xz
Don't use PathV1.h in llvm-link.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184092 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-link')
-rw-r--r--tools/llvm-link/llvm-link.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp
index 1155f39ec6..d8d7534e5c 100644
--- a/tools/llvm-link/llvm-link.cpp
+++ b/tools/llvm-link/llvm-link.cpp
@@ -21,7 +21,6 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
-#include "llvm/Support/PathV1.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/SourceMgr.h"
@@ -56,18 +55,11 @@ DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden);
//
static inline Module *LoadFile(const char *argv0, const std::string &FN,
LLVMContext& Context) {
- sys::Path Filename;
- if (!Filename.set(FN)) {
- errs() << "Invalid file name: '" << FN << "'\n";
- return NULL;
- }
-
SMDiagnostic Err;
- if (Verbose) errs() << "Loading '" << Filename.c_str() << "'\n";
+ if (Verbose) errs() << "Loading '" << FN << "'\n";
Module* Result = 0;
-
- const std::string &FNStr = Filename.str();
- Result = ParseIRFile(FNStr, Err, Context);
+
+ Result = ParseIRFile(FN, Err, Context);
if (Result) return Result; // Load successful!
Err.print(argv0, errs());