2 files changed, 4 insertions, 3 deletions
diff --git a/lld/include/lld/Core/TargetOptionsCommandFlags.h b/lld/include/lld/Core/TargetOptionsCommandFlags.h
index 9ba99d94b95..9c4ff7cea3f 100644
--- a/lld/include/lld/Core/TargetOptionsCommandFlags.h
+++ b/lld/include/lld/Core/TargetOptionsCommandFlags.h
@@ -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();
 }
diff --git a/lld/lib/Core/TargetOptionsCommandFlags.cpp b/lld/lib/Core/TargetOptionsCommandFlags.cpp
index e0f26761e70..333c283fae8 100644
--- a/lld/lib/Core/TargetOptionsCommandFlags.cpp
+++ b/lld/lib/Core/TargetOptionsCommandFlags.cpp
@@ -27,6 +27,6 @@ llvm::TargetOptions lld::InitTargetOptionsFromCodeGenFlags() {
   return ::InitTargetOptionsFromCodeGenFlags();
 }
 
-llvm::CodeModel::Model lld::GetCodeModelFromCMModel() {
-  return CMModel;
+llvm::Optional<llvm::CodeModel::Model> lld::GetCodeModelFromCMModel() {
+  return getCodeModel();
 }