diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-10-06 16:47:31 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-10-06 16:47:31 +0000 |
| commit | 83b2a3337f975a876037acfc0f6c1ce8606892b6 (patch) | |
| tree | 4f4e4e6ed1a76cf540f67ea970f9a48fddd4c0d4 /llvm | |
| parent | 8f3d2c9058a4590b58aa24d15ca1dfe05e64d3e9 (diff) | |
| download | bcm5719-llvm-83b2a3337f975a876037acfc0f6c1ce8606892b6.tar.gz bcm5719-llvm-83b2a3337f975a876037acfc0f6c1ce8606892b6.zip | |
Make sure weak symbols are listed after the local ones.
llvm-svn: 115795
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/MC/MCELFStreamer.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/weak.s | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index da3e7efda8b..cbe0ebfa4ad 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -512,8 +512,9 @@ void ELFObjectWriterImpl::WriteSymbolTable(MCDataFragment *F, for (unsigned i = 0, e = ExternalSymbolData.size(); i != e; ++i) { ELFSymbolData &MSD = ExternalSymbolData[i]; MCSymbolData &Data = *MSD.SymbolData; - assert((Data.getFlags() & ELF_STB_Global) && - "External symbol requires STB_GLOBAL flag"); + assert(((Data.getFlags() & ELF_STB_Global) || + (Data.getFlags() & ELF_STB_Weak)) && + "External symbol requires STB_GLOBAL or STB_WEAK flag"); WriteSymbol(F, MSD, Layout); if (GetBinding(Data) == ELF::STB_LOCAL) LastLocalSymbolIndex++; diff --git a/llvm/lib/MC/MCELFStreamer.cpp b/llvm/lib/MC/MCELFStreamer.cpp index b63bedc7030..65a0a7d7e65 100644 --- a/llvm/lib/MC/MCELFStreamer.cpp +++ b/llvm/lib/MC/MCELFStreamer.cpp @@ -272,6 +272,7 @@ void MCELFStreamer::EmitSymbolAttribute(MCSymbol *Symbol, case MCSA_WeakReference: case MCSA_Weak: SetBinding(SD, ELF::STB_WEAK); + SD.setExternal(true); BindingExplicitlySet.insert(Symbol); break; diff --git a/llvm/test/MC/ELF/weak.s b/llvm/test/MC/ELF/weak.s index ef8e000c60d..0b93a871183 100644 --- a/llvm/test/MC/ELF/weak.s +++ b/llvm/test/MC/ELF/weak.s @@ -5,6 +5,20 @@ .weak foo .long foo +// And that bar is after all local symbols + .weak bar +bar: + +//CHECK: # Symbol 4 +//CHECK-NEXT: (('st_name', 5) # 'bar' +//CHECK-NEXT: ('st_bind', 2) +//CHECK-NEXT: ('st_type', 0) +//CHECK-NEXT: ('st_other', 0) +//CHECK-NEXT: ('st_shndx', 1) +//CHECK-NEXT: ('st_value', 0) +//CHECK-NEXT: ('st_size', 0) +//CHECK-NEXT: ), +//CHECK-NEXT: # Symbol 5 //CHECK: (('st_name', 1) # 'foo' //CHECK-NEXT: ('st_bind', 2) //CHECK-NEXT: ('st_type', 0) @@ -12,3 +26,5 @@ //CHECK-NEXT: ('st_shndx', 0) //CHECK-NEXT: ('st_value', 0) //CHECK-NEXT: ('st_size', 0) +//CHECK-NEXT: ), +//CHECK-NEXT: ]) |
