From 384e0a667a03156faed5fb21210af8a9288a9122 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 27 Jun 2018 19:15:02 +0000
Subject: Vendor import of lld 6.0.1 release r335540:
 https://llvm.org/svn/llvm-project/lld/tags/RELEASE_601/final@335540

---
 ELF/Driver.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ELF/Driver.cpp')

diff --git a/ELF/Driver.cpp b/ELF/Driver.cpp
index 714976ae9c4b..44cfa56c94ce 100644
--- a/ELF/Driver.cpp
+++ b/ELF/Driver.cpp
@@ -668,6 +668,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
   Config->WarnCommon = Args.hasArg(OPT_warn_common);
   Config->ZCombreloc = !hasZOption(Args, "nocombreloc");
   Config->ZExecstack = hasZOption(Args, "execstack");
+  Config->ZHazardplt = hasZOption(Args, "hazardplt");
   Config->ZNocopyreloc = hasZOption(Args, "nocopyreloc");
   Config->ZNodelete = hasZOption(Args, "nodelete");
   Config->ZNodlopen = hasZOption(Args, "nodlopen");
-- 
cgit v1.3