diff options
| author | Roman Divacky <rdivacky@freebsd.org> | 2010-12-20 21:14:39 +0000 |
|---|---|---|
| committer | Roman Divacky <rdivacky@freebsd.org> | 2010-12-20 21:14:39 +0000 |
| commit | 55184ddd357c4a43db33bfded6dfeeaa96436312 (patch) | |
| tree | ec3f8b82dab29b8eb4bc11aa622daafddf2ed46c | |
| parent | b0602a6b0ff9b3363cf3aa04277154df1b91f83b (diff) | |
| download | bcm5719-llvm-55184ddd357c4a43db33bfded6dfeeaa96436312.tar.gz bcm5719-llvm-55184ddd357c4a43db33bfded6dfeeaa96436312.zip | |
Set the value of absolute symbols.
llvm-svn: 122268
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 9 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/set.s | 15 |
2 files changed, 23 insertions, 1 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 1bb47751ed4..bb523cefedc 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -518,6 +518,15 @@ static uint64_t SymbolValue(MCSymbolData &Data, const MCAsmLayout &Layout) { return Data.getCommonAlignment(); const MCSymbol &Symbol = Data.getSymbol(); + + if (Symbol.isAbsolute() && Symbol.isVariable()) { + if (const MCExpr *Value = Symbol.getVariableValue()) { + int64_t IntValue; + if (Value->EvaluateAsAbsolute(IntValue, Layout)) + return (uint64_t)IntValue; + } + } + if (!Symbol.isInSection()) return 0; diff --git a/llvm/test/MC/ELF/set.s b/llvm/test/MC/ELF/set.s index ddc7c5bb111..69d6c910636 100644 --- a/llvm/test/MC/ELF/set.s +++ b/llvm/test/MC/ELF/set.s @@ -1,5 +1,18 @@ // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump --dump-section-data | FileCheck %s +// Test that we emit the correct value. + +.set kernbase,0xffffffff80000000 + +// CHECK: (('st_name', 0x00000001) # 'kernbase' +// CHECK-NEXT: ('st_bind', 0x00000000) +// CHECK-NEXT: ('st_type', 0x00000000) +// CHECK-NEXT: ('st_other', 0x00000000) +// CHECK-NEXT: ('st_shndx', 0x0000fff1) +// CHECK-NEXT: ('st_value', 0xffffffff80000000) +// CHECK-NEXT: ('st_size', 0x0000000000000000) +// CHECK-NEXT: ), + // Test that we accept .set of a symbol after it has been used in a statement. jmp foo @@ -11,7 +24,7 @@ .set foo2,bar2 // Test that there is an undefined reference to bar -// CHECK: (('st_name', 0x00000001) # 'bar' +// CHECK: (('st_name', 0x0000000a) # 'bar' // CHECK-NEXT: ('st_bind', 0x00000001) // CHECK-NEXT: ('st_type', 0x00000000) // CHECK-NEXT: ('st_other', 0x00000000) |
