1 files changed, 6 insertions, 7 deletions
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
index b768d7852b5..b68a72c9aa8 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86TargetHandler.h"
-#include "X86TargetInfo.h"
+#include "X86LinkingContext.h"
 
 using namespace lld;
 using namespace elf;
@@ -55,9 +55,9 @@ ErrorOr<void> X86TargetRelocationHandler::applyRelocation(
   default : {
     std::string str;
     llvm::raw_string_ostream s(str);
-    auto name = _targetInfo.stringFromRelocKind(ref.kind());
-    s << "Unhandled relocation: "
-      << (name ? *name : "<unknown>" ) << " (" << ref.kind() << ")";
+    auto name = _context.stringFromRelocKind(ref.kind());
+    s << "Unhandled relocation: " << (name ? *name : "<unknown>") << " ("
+      << ref.kind() << ")";
     s.flush();
     llvm_unreachable(str.c_str());
   }
@@ -66,7 +66,6 @@ ErrorOr<void> X86TargetRelocationHandler::applyRelocation(
   return error_code::success();
 }
 
-X86TargetHandler::X86TargetHandler(X86TargetInfo &targetInfo)
+X86TargetHandler::X86TargetHandler(X86LinkingContext &targetInfo)
     : DefaultTargetHandler(targetInfo), _relocationHandler(targetInfo),
-      _targetLayout(targetInfo) {
-}
+      _targetLayout(targetInfo) {}