[llvm] r258101 - Add a change accidentally left out from r258100

[Tobias Edler von Koch via llvm-commits]

Author: tobiasvk
Date: Mon Jan 18 17:35:24 2016
New Revision: 258101

URL: http://llvm.org/viewvc/llvm-project?rev=258101&view=rev
Log:
Add a change accidentally left out from r258100

Also remove an executable bit introduced by r258083.


Modified:
    llvm/trunk/lib/Transforms/Utils/SplitModule.cpp   (props changed)
    llvm/trunk/tools/llvm-lto/llvm-lto.cpp

Propchange: llvm/trunk/lib/Transforms/Utils/SplitModule.cpp
------------------------------------------------------------------------------
--- svn:executable (original)
+++ svn:executable (removed)
@@ -1 +0,0 @@
-*

Modified: llvm/trunk/tools/llvm-lto/llvm-lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-lto/llvm-lto.cpp?rev=258101&r1=258100&r2=258101&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-lto/llvm-lto.cpp (original)
+++ llvm/trunk/tools/llvm-lto/llvm-lto.cpp Mon Jan 18 17:35:24 2016
@@ -98,6 +98,10 @@ static cl::opt<bool> SetMergedModule(
 static cl::opt<unsigned> Parallelism("j", cl::Prefix, cl::init(1),
                                      cl::desc("Number of backend threads"));
 
+static cl::opt<bool> RestoreGlobalsLinkage(
+    "restore-linkage", cl::init(false),
+    cl::desc("Restore original linkage of globals prior to CodeGen"));
+
 namespace {
 struct ModuleInfo {
   std::vector<bool> CanBeHidden;
@@ -278,6 +282,7 @@ int main(int argc, char **argv) {
 
   CodeGen.setDebugInfo(LTO_DEBUG_MODEL_DWARF);
   CodeGen.setTargetOptions(Options);
+  CodeGen.setShouldRestoreGlobalsLinkage(RestoreGlobalsLinkage);
 
   llvm::StringSet<llvm::MallocAllocator> DSOSymbolsSet;
   for (unsigned i = 0; i < DSOSymbols.size(); ++i)