[ARM] Prepare for VariantKind to specifier rename. NFC

Author: MaskRay

llvm/lib/Target/ARM/ARMMCInstLower.cpp

@@ -37,41 +37,38 @@ using namespace llvm;
 
 MCOperand ARMAsmPrinter::GetSymbolRef(const MachineOperand &MO,
                                       const MCSymbol *Symbol) {
-  MCSymbolRefExpr::VariantKind SymbolVariant = MCSymbolRefExpr::VK_None;
+  MCSymbolRefExpr::VariantKind Specifier = MCSymbolRefExpr::VK_None;
   if (MO.getTargetFlags() & ARMII::MO_SBREL)
-    SymbolVariant = MCSymbolRefExpr::VK_ARM_SBREL;
+    Specifier = MCSymbolRefExpr::VK_ARM_SBREL;
 
-  const MCExpr *Expr =
-      MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+  const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
   switch (MO.getTargetFlags() & ARMII::MO_OPTION_MASK) {
   default:
     llvm_unreachable("Unknown target flag on symbol operand");
   case ARMII::MO_NO_FLAG:
     break;
   case ARMII::MO_LO16:
-    Expr =
-        MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+    Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
     Expr = ARMMCExpr::createLower16(Expr, OutContext);
     break;
   case ARMII::MO_HI16:
-    Expr =
-        MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+    Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
     Expr = ARMMCExpr::createUpper16(Expr, OutContext);
     break;
   case ARMII::MO_LO_0_7:
-    Expr = MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+    Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
     Expr = ARMMCExpr::createLower0_7(Expr, OutContext);
     break;
   case ARMII::MO_LO_8_15:
-    Expr = MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+    Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
     Expr = ARMMCExpr::createLower8_15(Expr, OutContext);
     break;
   case ARMII::MO_HI_0_7:
-    Expr = MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+    Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
     Expr = ARMMCExpr::createUpper0_7(Expr, OutContext);
     break;
   case ARMII::MO_HI_8_15:
-    Expr = MCSymbolRefExpr::create(Symbol, SymbolVariant, OutContext);
+    Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
     Expr = ARMMCExpr::createUpper8_15(Expr, OutContext);
     break;
   }

llvm/lib/Target/ARM/ARMTargetObjectFile.cpp

@@ -28,6 +28,11 @@ using namespace dwarf;
 //                               ELF Target
 //===----------------------------------------------------------------------===//
 
+ARMElfTargetObjectFile::ARMElfTargetObjectFile() {
+  PLTRelativeVariantKind = MCSymbolRefExpr::VK_ARM_PREL31;
+  SupportIndirectSymViaGOTPCRel = true;
+}
+
 void ARMElfTargetObjectFile::Initialize(MCContext &Ctx,
                                         const TargetMachine &TM) {
   const ARMBaseTargetMachine &ARM_TM = static_cast<const ARMBaseTargetMachine &>(TM);

llvm/lib/Target/ARM/ARMTargetObjectFile.h

@@ -17,11 +17,7 @@ namespace llvm {
 
 class ARMElfTargetObjectFile : public TargetLoweringObjectFileELF {
 public:
-  ARMElfTargetObjectFile() {
-    PLTRelativeVariantKind = MCSymbolRefExpr::VK_ARM_PREL31;
-    SupportIndirectSymViaGOTPCRel = true;
-  }
-
+  ARMElfTargetObjectFile();
   void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
 
   MCRegister getStaticBase() const override;