summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Object/COFFModuleDefinition.cpp
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2017-07-18 22:11:00 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2017-07-18 22:11:00 +0000
commite234901a8469fd62d7b9e490832fb8a36d5590df (patch)
tree9bc5ddede167cd5689fed6cab59f493aaf20b36c /llvm/lib/Object/COFFModuleDefinition.cpp
parentafbb7be6d564a326a2f7ade0cbca103cb821f9c0 (diff)
downloadbcm5719-llvm-e234901a8469fd62d7b9e490832fb8a36d5590df.tar.gz
bcm5719-llvm-e234901a8469fd62d7b9e490832fb8a36d5590df.zip
Object: handle extensions properly in def files
When given an extension as part of the `library` directive in a def file, the extension is preserved/honoured by link/lib. Behave similarly when parsing the def file. This requires checking if a native extension is provided as a keyword parameter. If no extension is present, append a standard `.dll` or `.exe` extension. This is best tested via lld, and I will add tests there as a follow up. llvm-svn: 308383
Diffstat (limited to 'llvm/lib/Object/COFFModuleDefinition.cpp')
-rw-r--r--llvm/lib/Object/COFFModuleDefinition.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Object/COFFModuleDefinition.cpp b/llvm/lib/Object/COFFModuleDefinition.cpp
index d6729684e20..5fa06e977fd 100644
--- a/llvm/lib/Object/COFFModuleDefinition.cpp
+++ b/llvm/lib/Object/COFFModuleDefinition.cpp
@@ -22,6 +22,7 @@
#include "llvm/Object/COFFImportFile.h"
#include "llvm/Object/Error.h"
#include "llvm/Support/Error.h"
+#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm::COFF;
@@ -188,9 +189,8 @@ private:
if (Error Err = parseName(&Name, &Info.ImageBase))
return Err;
// Append the appropriate file extension if not already present.
- StringRef Ext = IsDll ? ".dll" : ".exe";
- if (!StringRef(Name).endswith_lower(Ext))
- Name += Ext;
+ if (!sys::path::has_extension(Name))
+ Name += IsDll ? ".dll" : ".exe";
// Set the output file, but don't override /out if it was already passed.
if (Info.OutputFile.empty())
OpenPOWER on IntegriCloud