diff --git a/llvm/lib/Support/PluginLoader.cpp b/llvm/lib/Support/PluginLoader.cpp
index be8833d0096d..1e67b94f69dc 100644
--- a/llvm/lib/Support/PluginLoader.cpp
+++ b/llvm/lib/Support/PluginLoader.cpp
@@ -37,5 +37,5 @@ namespace {
 
 // This causes operator= above to be invoked for every -load option.
 static cl::opt<PluginLoader, false, cl::parser<std::string> >
-LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"),
+LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin" SHLIBEXT),
         cl::desc("Load the specified plugin"));
diff --git a/llvm/lib/Support/ToolRunner.cpp b/llvm/lib/Support/ToolRunner.cpp
index b1fb64b9908e..f81da620eff2 100644
--- a/llvm/lib/Support/ToolRunner.cpp
+++ b/llvm/lib/Support/ToolRunner.cpp
@@ -337,7 +337,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
 
 int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType,
                           std::string &OutputFile) {
-  OutputFile = getUniqueFilename(InputFile+".so");
+  OutputFile = getUniqueFilename(InputFile+SHLIBEXT);
   // Compile the C/asm file into a shared object
   const char* GCCArgs[] = {
     GCCPath.c_str(),
diff --git a/llvm/tools/gccld/Linker.cpp b/llvm/tools/gccld/Linker.cpp
index 7cd440d1d267..296d87b0eb49 100644
--- a/llvm/tools/gccld/Linker.cpp
+++ b/llvm/tools/gccld/Linker.cpp
@@ -56,8 +56,8 @@ std::string llvm::FindLib(const std::string &Filename,
     if (!SharedObjectOnly && FileOpenable(Directory + LibName + ".bc"))
       return Directory + LibName + ".bc";
 
-    if (FileOpenable(Directory + LibName + ".so"))
-      return Directory + LibName + ".so";
+    if (FileOpenable(Directory + LibName + SHLIBEXT))
+      return Directory + LibName + SHLIBEXT;
 
     if (!SharedObjectOnly && FileOpenable(Directory + LibName + ".a"))
       return Directory + LibName + ".a";
diff --git a/llvm/tools/llee/Makefile b/llvm/tools/llee/Makefile
index a93c4deddc26..50632e097438 100644
--- a/llvm/tools/llee/Makefile
+++ b/llvm/tools/llee/Makefile
@@ -16,7 +16,7 @@ all:: llee
 llee: $(DESTTOOLCURRENT)/llee
 
 $(DESTTOOLCURRENT)/llee: Makefile
-	echo exec env LD_PRELOAD=$(DESTLIBCURRENT)/execve.so $$\* > $@
+	echo exec env LD_PRELOAD=$(DESTLIBCURRENT)/execve$(SHLIBEXT) $$\* > $@
 	chmod u+x $@
 
 clean::