Make sure the STT_FILE symbol is the first one in the symbol table.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114285 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2010-09-18 15:03:21 +00:00
parent 9e8d1f97e9
commit ad49cf5866
2 changed files with 36 additions and 0 deletions

View File

@ -34,6 +34,15 @@
#include <vector> #include <vector>
using namespace llvm; using namespace llvm;
static unsigned GetType(const MCSymbolData &SD) {
uint32_t Type = (SD.getFlags() & (0xf << ELF_STT_Shift)) >> ELF_STT_Shift;
assert(Type == ELF::STT_NOTYPE || Type == ELF::STT_OBJECT ||
Type == ELF::STT_FUNC || Type == ELF::STT_SECTION ||
Type == ELF::STT_FILE || Type == ELF::STT_COMMON ||
Type == ELF::STT_TLS);
return Type;
}
namespace { namespace {
class ELFObjectWriterImpl { class ELFObjectWriterImpl {
@ -64,6 +73,10 @@ namespace {
// Support lexicographic sorting. // Support lexicographic sorting.
bool operator<(const ELFSymbolData &RHS) const { bool operator<(const ELFSymbolData &RHS) const {
if (GetType(*SymbolData) == ELF::STT_FILE)
return true;
if (GetType(*RHS.SymbolData) == ELF::STT_FILE)
return false;
return SymbolData->getSymbol().getName() < return SymbolData->getSymbol().getName() <
RHS.SymbolData->getSymbol().getName(); RHS.SymbolData->getSymbol().getName();
} }

23
test/MC/ELF/file.s Normal file
View File

@ -0,0 +1,23 @@
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump | FileCheck %s
// Test that the STT_FILE symbol precedes the other local symbols.
.file "foo"
foa:
// CHECK: # Symbol 1
// CHECK-NEXT: (('st_name', 1) # 'foo'
// CHECK-NEXT: ('st_bind', 0)
// CHECK-NEXT: ('st_type', 4)
// CHECK-NEXT: ('st_other', 0)
// CHECK-NEXT: ('st_shndx', 65521)
// CHECK-NEXT: ('st_value', 0)
// CHECK-NEXT: ('st_size', 0)
// CHECK-NEXT: ),
// CHECK-NEXT: # Symbol 2
// CHECK-NEXT: (('st_name', 5) # 'foa'
// CHECK-NEXT: ('st_bind', 0)
// 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)