[lld] r309913 - Update for llvm change.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Wed Aug  2 19:16:33 2017
New Revision: 309913

URL: http://llvm.org/viewvc/llvm-project?rev=309913&view=rev
Log:
Update for llvm change.

Modified:
    lld/trunk/include/lld/Core/TargetOptionsCommandFlags.h
    lld/trunk/lib/Core/TargetOptionsCommandFlags.cpp

Modified: lld/trunk/include/lld/Core/TargetOptionsCommandFlags.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/TargetOptionsCommandFlags.h?rev=309913&r1=309912&r2=309913&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/TargetOptionsCommandFlags.h (original)
+++ lld/trunk/include/lld/Core/TargetOptionsCommandFlags.h Wed Aug  2 19:16:33 2017
@@ -11,10 +11,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/Optional.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Target/TargetOptions.h"
 
 namespace lld {
 llvm::TargetOptions InitTargetOptionsFromCodeGenFlags();
-llvm::CodeModel::Model GetCodeModelFromCMModel();
+llvm::Optional<llvm::CodeModel::Model> GetCodeModelFromCMModel();
 }

Modified: lld/trunk/lib/Core/TargetOptionsCommandFlags.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/TargetOptionsCommandFlags.cpp?rev=309913&r1=309912&r2=309913&view=diff
==============================================================================
--- lld/trunk/lib/Core/TargetOptionsCommandFlags.cpp (original)
+++ lld/trunk/lib/Core/TargetOptionsCommandFlags.cpp Wed Aug  2 19:16:33 2017
@@ -27,6 +27,6 @@ llvm::TargetOptions lld::InitTargetOptio
   return ::InitTargetOptionsFromCodeGenFlags();
 }
 
-llvm::CodeModel::Model lld::GetCodeModelFromCMModel() {
-  return CMModel;
+llvm::Optional<llvm::CodeModel::Model> lld::GetCodeModelFromCMModel() {
+  return getCodeModel();
 }