[lld] r296225 - Rename OMagic -> Omagic for consistency.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Fri Feb 24 19:52:03 2017
New Revision: 296225

URL: http://llvm.org/viewvc/llvm-project?rev=296225&view=rev
Log:
Rename OMagic -> Omagic for consistency.

Modified:
    lld/trunk/ELF/Config.h
    lld/trunk/ELF/Driver.cpp
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Config.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=296225&r1=296224&r2=296225&view=diff
==============================================================================
--- lld/trunk/ELF/Config.h (original)
+++ lld/trunk/ELF/Config.h Fri Feb 24 19:52:03 2017
@@ -117,7 +117,7 @@ struct Configuration {
   bool NoUndefinedVersion;
   bool Nostdlib;
   bool OFormatBinary;
-  bool OMagic;
+  bool Omagic;
   bool OptRemarksWithHotness;
   bool Pie;
   bool PrintGcSections;

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=296225&r1=296224&r2=296225&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Fri Feb 24 19:52:03 2017
@@ -548,7 +548,7 @@ void LinkerDriver::readConfigs(opt::Inpu
   Config->NoUndefinedVersion = Args.hasArg(OPT_no_undefined_version);
   Config->Nostdlib = Args.hasArg(OPT_nostdlib);
   Config->OFormatBinary = isOutputFormatBinary(Args);
-  Config->OMagic = Args.hasArg(OPT_omagic);
+  Config->Omagic = Args.hasArg(OPT_omagic);
   Config->OptRemarksFilename = getString(Args, OPT_opt_remarks_filename);
   Config->OptRemarksWithHotness = Args.hasArg(OPT_opt_remarks_with_hotness);
   Config->Optimize = getInteger(Args, OPT_O, 1);
@@ -606,7 +606,7 @@ void LinkerDriver::readConfigs(opt::Inpu
   // .text segments are writable. Today, the option is still in use to
   // create special-purpose programs such as boot loaders. It doesn't
   // make sense to create PT_GNU_RELRO for such executables.
-  if (Config->OMagic)
+  if (Config->Omagic)
     Config->ZRelro = false;
 
   if (!Config->Relocatable)

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=296225&r1=296224&r2=296225&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Fri Feb 24 19:52:03 2017
@@ -1251,7 +1251,7 @@ template <class ELFT> static bool needsP
 // cannot create a PT_LOAD there.
 template <class ELFT>
 static typename ELFT::uint computeFlags(typename ELFT::uint F) {
-  if (Config->OMagic)
+  if (Config->Omagic)
     return PF_R | PF_W | PF_X;
   if (Config->SingleRoRx && !(F & PF_W))
     return F | PF_X;