From 6eface7c9d4c37618201583ff2f3347fa2be884f Mon Sep 17 00:00:00 2001
From: Chandler Carruth <chandlerc@gmail.com>
Date: Sun, 2 Mar 2014 09:35:33 +0000
Subject: [PATCH] [C++11] Switch from LLVM_FINAL to just "final" now that all
 of LLVM is requiring MSVC 2012 or newer.

llvm-svn: 202626
---
 lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h    | 2 +-
 lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h | 2 +-
 lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp   | 2 +-
 lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h     | 4 ++--
 lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h          | 2 +-
 lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h       | 2 +-
 lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h           | 4 ++--
 lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h            | 2 +-
 lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h             | 4 ++--
 lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h            | 2 +-
 lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h             | 4 ++--
 lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h      | 2 +-
 lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h   | 2 +-
 lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp    | 4 ++--
 lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h       | 2 +-
 lld/lib/ReaderWriter/PECOFF/Atoms.h                         | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
index db8630697463..9aa64f4103d5 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
@@ -20,7 +20,7 @@ namespace elf {
 
 typedef llvm::object::ELFType<llvm::support::little, 2, false> HexagonELFType;
 
-class HexagonLinkingContext LLVM_FINAL : public ELFLinkingContext {
+class HexagonLinkingContext final : public ELFLinkingContext {
 public:
   HexagonLinkingContext(llvm::Triple triple);
 
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
index 191a1a0243b9..4fc7991919d9 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
@@ -19,7 +19,7 @@ namespace elf {
 class HexagonLinkingContext;
 class HexagonTargetHandler;
 
-class HexagonTargetRelocationHandler LLVM_FINAL :
+class HexagonTargetRelocationHandler final :
     public TargetRelocationHandler<HexagonELFType> {
 public:
   HexagonTargetRelocationHandler(HexagonLinkingContext &context,
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
index a7481a871d06..1e0b4fb43345 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp
@@ -235,7 +235,7 @@ protected:
   /// @}
 };
 
-class DynamicGOTPLTPass LLVM_FINAL : public GOTPLTPass<DynamicGOTPLTPass> {
+class DynamicGOTPLTPass final : public GOTPLTPass<DynamicGOTPLTPass> {
 public:
   DynamicGOTPLTPass(const elf::HexagonLinkingContext &ctx) : GOTPLTPass(ctx) {
     _got0 = new (_file._alloc) HexagonGOTPLT0Atom(_file);
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
index 35417914c217..5766c415bb3d 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
@@ -24,7 +24,7 @@ class HexagonLinkingContext;
 
 /// \brief TargetLayout for Hexagon
 template <class HexagonELFType>
-class HexagonTargetLayout LLVM_FINAL : public TargetLayout<HexagonELFType> {
+class HexagonTargetLayout final : public TargetLayout<HexagonELFType> {
 public:
   enum HexagonSectionOrder {
     ORDER_SDATA = 205
@@ -103,7 +103,7 @@ private:
 };
 
 /// \brief TargetHandler for Hexagon
-class HexagonTargetHandler LLVM_FINAL :
+class HexagonTargetHandler final :
     public DefaultTargetHandler<HexagonELFType> {
 public:
   HexagonTargetHandler(HexagonLinkingContext &targetInfo);
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
index f44ff7ff979c..bb6c3b2a445d 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.h
@@ -32,7 +32,7 @@ typedef llvm::object::ELFType<llvm::support::little, 2, false> Mips32ElELFType;
 
 template <class ELFType> class MipsTargetLayout;
 
-class MipsLinkingContext LLVM_FINAL : public ELFLinkingContext {
+class MipsLinkingContext final : public ELFLinkingContext {
 public:
   MipsLinkingContext(llvm::Triple triple);
 
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h
index 972e81251c9c..7c39d8c5ed43 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.h
@@ -16,7 +16,7 @@ namespace elf {
 
 class MipsTargetHandler;
 
-class MipsTargetRelocationHandler LLVM_FINAL
+class MipsTargetRelocationHandler final
     : public TargetRelocationHandler<Mips32ElELFType> {
 public:
   MipsTargetRelocationHandler(MipsLinkingContext &context,
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h b/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
index 44c3d26aa75c..92e657e7c508 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsTargetHandler.h
@@ -20,7 +20,7 @@ namespace elf {
 
 /// \brief TargetLayout for Mips
 template <class ELFType>
-class MipsTargetLayout LLVM_FINAL : public TargetLayout<ELFType> {
+class MipsTargetLayout final : public TargetLayout<ELFType> {
 public:
   MipsTargetLayout(const MipsLinkingContext &ctx)
       : TargetLayout<ELFType>(ctx),
@@ -67,7 +67,7 @@ public:
 };
 
 /// \brief TargetHandler for Mips
-class MipsTargetHandler LLVM_FINAL
+class MipsTargetHandler final
     : public DefaultTargetHandler<Mips32ElELFType> {
 public:
   MipsTargetHandler(MipsLinkingContext &context);
diff --git a/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h b/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h
index 799123ee2757..782f7cd607be 100644
--- a/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h
@@ -20,7 +20,7 @@
 namespace lld {
 namespace elf {
 
-class PPCLinkingContext LLVM_FINAL : public ELFLinkingContext {
+class PPCLinkingContext final : public ELFLinkingContext {
 public:
   PPCLinkingContext(llvm::Triple triple)
       : ELFLinkingContext(triple, std::unique_ptr<TargetHandlerBase>(
diff --git a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h
index eba58bf328d8..dda97ac49e8b 100644
--- a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h
@@ -23,7 +23,7 @@ public:
   PPCTargetLayout(PPCLinkingContext &context) : TargetLayout<ELFT>(context) {}
 };
 
-class PPCTargetRelocationHandler LLVM_FINAL
+class PPCTargetRelocationHandler final
     : public TargetRelocationHandler<PPCELFType> {
 public:
   PPCTargetRelocationHandler(PPCLinkingContext &context,
@@ -39,7 +39,7 @@ protected:
   PPCTargetLayout<PPCELFType> &_ppcTargetLayout;
 };
 
-class PPCTargetHandler LLVM_FINAL
+class PPCTargetHandler final
     : public DefaultTargetHandler<PPCELFType> {
 public:
   PPCTargetHandler(PPCLinkingContext &context);
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h
index 92cd9255dcf5..9b930fb4cfdf 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.h
@@ -19,7 +19,7 @@
 
 namespace lld {
 namespace elf {
-class X86LinkingContext LLVM_FINAL : public ELFLinkingContext {
+class X86LinkingContext final : public ELFLinkingContext {
 public:
   X86LinkingContext(llvm::Triple triple)
       : ELFLinkingContext(triple, std::unique_ptr<TargetHandlerBase>(
diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
index 7918c190680f..31278ef05c66 100644
--- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h
@@ -26,7 +26,7 @@ public:
   X86TargetLayout(X86LinkingContext &context) : TargetLayout<ELFT>(context) {}
 };
 
-class X86TargetRelocationHandler LLVM_FINAL
+class X86TargetRelocationHandler final
     : public TargetRelocationHandler<X86ELFType> {
 public:
   X86TargetRelocationHandler(X86LinkingContext &context,
@@ -44,7 +44,7 @@ protected:
   X86TargetLayout<X86ELFType> &_x86TargetLayout;
 };
 
-class X86TargetHandler LLVM_FINAL
+class X86TargetHandler final
     : public DefaultTargetHandler<X86ELFType> {
 public:
   X86TargetHandler(X86LinkingContext &context);
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h
index 1f95c2142f7a..39bc6c6cd293 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h
@@ -27,7 +27,7 @@ enum {
   LLD_R_X86_64_GOTRELINDEX = 1024,
 };
 
-class X86_64LinkingContext LLVM_FINAL : public ELFLinkingContext {
+class X86_64LinkingContext final : public ELFLinkingContext {
 public:
   X86_64LinkingContext(llvm::Triple triple)
       : ELFLinkingContext(triple, std::unique_ptr<TargetHandlerBase>(
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
index ac4540d1ab51..cd60548fe7fa 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
@@ -19,7 +19,7 @@ class X86_64LinkingContext;
 
 template <class ELFT> class X86_64TargetLayout;
 
-class X86_64TargetRelocationHandler LLVM_FINAL
+class X86_64TargetRelocationHandler final
     : public TargetRelocationHandler<X86_64ELFType> {
 public:
   X86_64TargetRelocationHandler(const X86_64LinkingContext &context,
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
index d7789e58787d..d513fd7b4b9e 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp
@@ -294,7 +294,7 @@ protected:
 /// entry, that entry is statically bound.
 ///
 /// TLS always assumes module 1 and attempts to remove indirection.
-class StaticRelocationPass LLVM_FINAL
+class StaticRelocationPass final
     : public RelocationPass<StaticRelocationPass> {
 public:
   StaticRelocationPass(const elf::X86_64LinkingContext &ctx)
@@ -327,7 +327,7 @@ public:
   }
 };
 
-class DynamicRelocationPass LLVM_FINAL
+class DynamicRelocationPass final
     : public RelocationPass<DynamicRelocationPass> {
 public:
   DynamicRelocationPass(const elf::X86_64LinkingContext &ctx)
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
index c3c3616ad636..fd4815b567e0 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
@@ -28,7 +28,7 @@ public:
       : TargetLayout<ELFT>(context) {}
 };
 
-class X86_64TargetHandler LLVM_FINAL
+class X86_64TargetHandler final
     : public DefaultTargetHandler<X86_64ELFType> {
 public:
   X86_64TargetHandler(X86_64LinkingContext &context);
diff --git a/lld/lib/ReaderWriter/PECOFF/Atoms.h b/lld/lib/ReaderWriter/PECOFF/Atoms.h
index 0748e95ac072..911e45cfa7da 100644
--- a/lld/lib/ReaderWriter/PECOFF/Atoms.h
+++ b/lld/lib/ReaderWriter/PECOFF/Atoms.h
@@ -25,7 +25,7 @@ class COFFDefinedAtom;
 /// example, if atom X has a reference to atom Y with offsetInAtom=8, that
 /// means that the address starting at 8th byte of the content of atom X needs
 /// to be fixed up so that the address points to atom Y's address.
-class COFFReference LLVM_FINAL : public Reference {
+class COFFReference final : public Reference {
 public:
   COFFReference(const Atom *target, uint32_t offsetInAtom, uint16_t relocType,
                 Reference::KindNamespace ns = Reference::KindNamespace::COFF,