[llvm-commits] [llvm] r112259 - /llvm/trunk/lib/MC/ELFObjectWriter.cpp

[Benjamin Kramer]

Author: d0k
Date: Fri Aug 27 05:38:39 2010
New Revision: 112259

URL: http://llvm.org/viewvc/llvm-project?rev=112259&view=rev
Log:
MCELF: Always overwrite FixedValue.

Modified:
    llvm/trunk/lib/MC/ELFObjectWriter.cpp

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=112259&r1=112258&r2=112259&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Fri Aug 27 05:38:39 2010
@@ -462,13 +462,13 @@
                                            uint64_t &FixedValue) {
   int64_t Addend = 0;
   unsigned Index = 0;
+  int64_t Value = Target.getConstant();
 
   if (!Target.isAbsolute()) {
     const MCSymbol *Symbol = &Target.getSymA()->getSymbol();
     MCSymbolData &SD = Asm.getSymbolData(*Symbol);
     const MCSymbolData *Base = Asm.getAtom(Layout, &SD);
     MCFragment *F = SD.getFragment();
-    int64_t Value = Target.getConstant();
 
     if (Base) {
       if (F && (!Symbol->isInSection() || SD.isCommon())) {
@@ -496,9 +496,10 @@
         return;
       }
     }
-    FixedValue = Value;
   }
 
+  FixedValue = Value;
+
   // determine the type of the relocation
   bool IsPCRel = isFixupKindX86PCRel(Fixup.getKind());
   unsigned Type;