From 110dda7915f63d2c06b53129093cd40e1a37d7dd Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Tue, 11 Oct 2016 17:46:48 +0000
Subject: [PATCH] Make variable name consistent with other -z options.

llvm-svn: 283910
---
 lld/ELF/Config.h   | 2 +-
 lld/ELF/Driver.cpp | 2 +-
 lld/ELF/Writer.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index a92c512..2ea9f7c 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -121,7 +121,7 @@ struct Configuration {
   bool Verbose;
   bool WarnCommon;
   bool ZCombreloc;
-  bool ZExecStack;
+  bool ZExecstack;
   bool ZNodelete;
   bool ZNow;
   bool ZOrigin;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index d9208f3..fee497b 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -489,7 +489,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
     error("--thinlto-jobs: number of threads must be > 0");
 
   Config->ZCombreloc = !hasZOption(Args, "nocombreloc");
-  Config->ZExecStack = hasZOption(Args, "execstack");
+  Config->ZExecstack = hasZOption(Args, "execstack");
   Config->ZNodelete = hasZOption(Args, "nodelete");
   Config->ZNow = hasZOption(Args, "now");
   Config->ZOrigin = hasZOption(Args, "origin");
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index a7ba822..d50deae 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -1103,7 +1103,7 @@ std::vector<PhdrEntry<ELFT>> Writer<ELFT>::createPhdrs() {
 
   // PT_GNU_STACK is a special section to tell the loader to make the
   // pages for the stack non-executable.
-  if (!Config->ZExecStack) {
+  if (!Config->ZExecstack) {
     Phdr &Hdr = *AddHdr(PT_GNU_STACK, PF_R | PF_W);
     if (Config->ZStackSize != uint64_t(-1))
       Hdr.H.p_memsz = Config->ZStackSize;
-- 
2.7.4