Merge commit '441c9a9273c5' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/include/llvm/MC/MCExpr.h

@@ -538,10 +538,6 @@ class MCTargetExpr : public MCExpr {
   virtual void visitUsedExpr(MCStreamer& Streamer) const = 0;
   virtual MCFragment *findAssociatedFragment() const = 0;
 
-  // Deprecated way to set the type of referenced ELF symbols to STT_TLS when
-  // the derived MCELFObjectTargetWriter::getRelocType does not update symbols.
-  virtual void fixELFSymbolsInTLSFixups(MCAssembler &) const {}
-
   static bool classof(const MCExpr *E) {
     return E->getKind() == MCExpr::Target;
   }

llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp

@@ -96,19 +96,6 @@ static void fixELFSymbolsInTLSFixupsImpl(const MCExpr *Expr, MCAssembler &Asm) {
   }
 }
 
-void CSKYMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const {
-  switch (getSpecifier()) {
-  default:
-    return;
-  case VK_TLSLE:
-  case VK_TLSIE:
-  case VK_TLSGD:
-    break;
-  }
-
-  fixELFSymbolsInTLSFixupsImpl(getSubExpr(), Asm);
-}
-
 bool CSKYMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
                                            const MCAssembler *Asm) const {
   if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))

llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.h

@@ -64,8 +64,6 @@ class CSKYMCExpr : public MCTargetExpr {
     return getSubExpr()->findAssociatedFragment();
   }
 
-  void fixELFSymbolsInTLSFixups(MCAssembler &Asm) const override;
-
   static bool classof(const MCExpr *E) {
     return E->getKind() == MCExpr::Target;
   }