Index: llvm/trunk/lib/Object/IRObjectFile.cpp =================================================================== --- llvm/trunk/lib/Object/IRObjectFile.cpp +++ llvm/trunk/lib/Object/IRObjectFile.cpp @@ -116,6 +116,9 @@ Res |= BasicSymbolRef::SF_Undefined; Res |= BasicSymbolRef::SF_Global; break; + case RecordStreamer::GlobalWeak: + Res |= BasicSymbolRef::SF_Weak; + Res |= BasicSymbolRef::SF_Global; } AsmUndefinedRefs(Key, BasicSymbolRef::Flags(Res)); } Index: llvm/trunk/lib/Object/RecordStreamer.h =================================================================== --- llvm/trunk/lib/Object/RecordStreamer.h +++ llvm/trunk/lib/Object/RecordStreamer.h @@ -15,12 +15,12 @@ namespace llvm { class RecordStreamer : public MCStreamer { public: - enum State { NeverSeen, Global, Defined, DefinedGlobal, Used }; + enum State { NeverSeen, Global, GlobalWeak, Defined, DefinedGlobal, Used }; private: StringMap Symbols; void markDefined(const MCSymbol &Symbol); - void markGlobal(const MCSymbol &Symbol); + void markGlobal(const MCSymbol &Symbol, MCSymbolAttr Attribute); void markUsed(const MCSymbol &Symbol); void visitUsedSymbol(const MCSymbol &Sym) override; Index: llvm/trunk/lib/Object/RecordStreamer.cpp =================================================================== --- llvm/trunk/lib/Object/RecordStreamer.cpp +++ llvm/trunk/lib/Object/RecordStreamer.cpp @@ -23,21 +23,26 @@ case Used: S = Defined; break; + case GlobalWeak: + break; } } -void RecordStreamer::markGlobal(const MCSymbol &Symbol) { +void RecordStreamer::markGlobal(const MCSymbol &Symbol, + MCSymbolAttr Attribute) { State &S = Symbols[Symbol.getName()]; switch (S) { case DefinedGlobal: case Defined: - S = DefinedGlobal; + S = (Attribute == MCSA_Weak) ? GlobalWeak : DefinedGlobal; break; case NeverSeen: case Global: case Used: - S = Global; + S = (Attribute == MCSA_Weak) ? GlobalWeak : Global; + break; + case GlobalWeak: break; } } @@ -48,6 +53,7 @@ case DefinedGlobal: case Defined: case Global: + case GlobalWeak: break; case NeverSeen: @@ -85,7 +91,7 @@ bool RecordStreamer::EmitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) { if (Attribute == MCSA_Global || Attribute == MCSA_Weak) - markGlobal(*Symbol); + markGlobal(*Symbol, Attribute); return true; } Index: llvm/trunk/test/Object/X86/nm-bitcodeweak.test =================================================================== --- llvm/trunk/test/Object/X86/nm-bitcodeweak.test +++ llvm/trunk/test/Object/X86/nm-bitcodeweak.test @@ -1,7 +1,7 @@ ; RUN: llvm-as %s -o=%t1 ; RUN: llvm-nm %t1 | FileCheck %s -; CHECK: T __libc_blah +; CHECK: W __libc_blah target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-freebsd11.0"