summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/Windows/DynamicLibrary.inc
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2013-10-06 20:44:34 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2013-10-06 20:44:34 +0000
commitf636cf422ee44138eed48dfc9dc05d20b6ae113c (patch)
tree012eeb09b116552d1471569c8080f6b58ac751f4 /llvm/lib/Support/Windows/DynamicLibrary.inc
parent80bea0c3153775b6be44db0fdae356345afe9d0f (diff)
downloadbcm5719-llvm-f636cf422ee44138eed48dfc9dc05d20b6ae113c.tar.gz
bcm5719-llvm-f636cf422ee44138eed48dfc9dc05d20b6ae113c.zip
Revert "Windows: Add support for unicode command lines"
This is causing MinGW bots to fail. This reverts commit r192069. llvm-svn: 192070
Diffstat (limited to 'llvm/lib/Support/Windows/DynamicLibrary.inc')
-rw-r--r--llvm/lib/Support/Windows/DynamicLibrary.inc9
1 files changed, 1 insertions, 8 deletions
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc
index 5a7b21920a9..2edaf74fa56 100644
--- a/llvm/lib/Support/Windows/DynamicLibrary.inc
+++ b/llvm/lib/Support/Windows/DynamicLibrary.inc
@@ -83,15 +83,8 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
// This is mostly to ensure that the return value still shows up as "valid".
return DynamicLibrary(&OpenedHandles);
}
-
- SmallVector<wchar_t, MAX_PATH> filenameUnicode;
- if (error_code ec = windows::UTF8ToUTF16(filename, filenameUnicode)) {
- SetLastError(ec.value());
- MakeErrMsg(errMsg, std::string(filename) + ": Can't convert to UTF-16: ");
- return DynamicLibrary();
- }
- HMODULE a_handle = LoadLibraryW(filenameUnicode.data());
+ HMODULE a_handle = LoadLibrary(filename);
if (a_handle == 0) {
MakeErrMsg(errMsg, std::string(filename) + ": Can't open : ");
OpenPOWER on IntegriCloud