From 51bed9c870ae9fa6a9ae340a63713261928f1ec0 Mon Sep 17 00:00:00 2001 From: Kevin Enderby Date: Fri, 7 May 2010 21:44:23 +0000 Subject: Fix i386 relocations to Weak Definitions. The relocation entries should be external and the item to be relocated should not have the address of the symbol added in. llvm-svn: 103302 --- llvm/lib/MC/MachObjectWriter.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'llvm/lib/MC/MachObjectWriter.cpp') diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp index bb8eb10a483..0dbb2c1c0e9 100644 --- a/llvm/lib/MC/MachObjectWriter.cpp +++ b/llvm/lib/MC/MachObjectWriter.cpp @@ -16,6 +16,7 @@ #include "llvm/MC/MCObjectWriter.h" #include "llvm/MC/MCSectionMachO.h" #include "llvm/MC/MCSymbol.h" +#include "llvm/MC/MCMachOSymbolFlags.h" #include "llvm/MC/MCValue.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MachO.h" @@ -753,9 +754,19 @@ public: const MCSymbol *Symbol = &Target.getSymA()->getSymbol(); MCSymbolData *SD = &Asm.getSymbolData(*Symbol); - if (Symbol->isUndefined()) { + // Both references to undefined symbols and references to Weak Definitions + // get external relocation entries. This is so the static and then the + // the dynamic linker can resolve them to the actual definition that will + // be used. And in the case of Weak Definitions a reference to one will + // not always be to the definition in the same object file. + if (Symbol->isUndefined() || (SD->getFlags() & SF_WeakDefinition)) { IsExtern = 1; Index = SD->getIndex(); + // In the case of a Weak Definition the FixedValue needs to be set to + // to not have the address of the symbol. In the case of an undefined + // symbol you can't call getSymbolAddress(). + if (SD->getFlags() & SF_WeakDefinition) + FixedValue -= Layout.getSymbolAddress(SD); Value = 0; } else { // The index is the section ordinal (1-based). -- cgit v1.2.3