[llvm] r267300 - [MC/ELF] Pass Fixup to getRelocType64.

Davide Italiano via llvm-commits llvm-commits at lists.llvm.org
Sat Apr 23 15:26:31 PDT 2016


Author: davide
Date: Sat Apr 23 17:26:31 2016
New Revision: 267300

URL: http://llvm.org/viewvc/llvm-project?rev=267300&view=rev
Log:
[MC/ELF] Pass Fixup to getRelocType64.

In preparation for other changes.

Modified:
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp?rev=267300&r1=267299&r2=267300&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp Sat Apr 23 17:26:31 2016
@@ -84,9 +84,10 @@ static void checkIs32(MCContext &Ctx, SM
                     "32 bit reloc applied to a field with a different size");
 }
 
-static unsigned getRelocType64(MCContext &Ctx, SMLoc Loc,
+static unsigned getRelocType64(MCContext &Ctx, const MCFixup &Fixup,
                                MCSymbolRefExpr::VariantKind Modifier,
                                X86_64RelType Type, bool IsPCRel) {
+  SMLoc Loc = Fixup.getLoc();
   switch (Modifier) {
   default:
     llvm_unreachable("Unimplemented");
@@ -258,7 +259,7 @@ unsigned X86ELFObjectWriter::getRelocTyp
   MCSymbolRefExpr::VariantKind Modifier = Target.getAccessVariant();
   X86_64RelType Type = getType64(Fixup.getKind(), Modifier, IsPCRel);
   if (getEMachine() == ELF::EM_X86_64)
-    return getRelocType64(Ctx, Fixup.getLoc(), Modifier, Type, IsPCRel);
+    return getRelocType64(Ctx, Fixup, Modifier, Type, IsPCRel);
 
   assert((getEMachine() == ELF::EM_386 || getEMachine() == ELF::EM_IAMCU) &&
          "Unsupported ELF machine type.");




More information about the llvm-commits mailing list