replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1. ARM/MC/ELF: A few more ELF relocs for .o 

2. Fixed EmitLocalCommonSymbol for ELF (Yes, they exist. :)
   Test added.

llvm-svn: 121951
This commit is contained in:
Jason W Kim 2010-12-16 03:12:17 +00:00
parent 8f514a8826
commit 4c1386add9
3 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/MC/ELFObjectWriter.cpp
View File

@ -1565,8 +1565,12 @@ unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target,
Type = ELF::R_ARM_GOT_BREL; break;
case MCSymbolRefExpr::VK_ARM_TLSGD:
Type = ELF::R_ARM_TLS_GD32; break;
case MCSymbolRefExpr::VK_ARM_TPOFF:
Type = ELF::R_ARM_TLS_LE32; break;
case MCSymbolRefExpr::VK_ARM_GOTTPOFF:
Type = ELF::R_ARM_TLS_IE32; break;
case MCSymbolRefExpr::VK_None:
Type = ELF::R_ARM_ABS32; break;
case MCSymbolRefExpr::VK_ARM_GOTOFF:
Type = ELF::R_ARM_GOTOFF32; break;
} break;
@ -1579,6 +1583,8 @@ unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target,
case ARM::fixup_arm_thumb_br:
assert(0 && "Unimplemented"); break;
case ARM::fixup_arm_branch:
// FIXME: Differentiate between R_ARM_CALL and
// R_ARM_JUMP24 (latter used for conditional jumps)
Type = ELF::R_ARM_CALL; break;
case ARM::fixup_arm_movt_hi16:
Type = ELF::R_ARM_MOVT_ABS; break;

15
llvm/lib/MC/MCELFStreamer.cpp
View File

@ -113,9 +113,8 @@ public:
SD.setSize(Value);
}
virtual void EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size) {
assert(0 && "ELF doesn't support this directive");
}
virtual void EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size);
virtual void EmitZerofill(const MCSection *Section, MCSymbol *Symbol = 0,
unsigned Size = 0, unsigned ByteAlignment = 0) {
assert(0 && "ELF doesn't support this directive");
@ -362,6 +361,16 @@ void MCELFStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
SD.setSize(MCConstantExpr::Create(Size, getContext()));
}
void MCELFStreamer::EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size) {
// FIXME: Should this be caught and done earlier?
MCSymbolData &SD = getAssembler().getOrCreateSymbolData(*Symbol);
SetBinding(SD, ELF::STB_LOCAL);
SD.setExternal(false);
BindingExplicitlySet.insert(Symbol);
// FIXME: ByteAlignment is not needed here, but is required.
EmitCommonSymbol(Symbol, Size, 1);
}
void MCELFStreamer::EmitBytes(StringRef Data, unsigned AddrSpace) {
// TODO: This is exactly the same as WinCOFFStreamer. Consider merging into
// MCObjectStreamer.

35
llvm/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll Normal file
View File

@ -0,0 +1,35 @@
; RUN: llc %s -mtriple=armv7-linux-gnueabi -arm-use-movt -filetype=obj -o - | \
; RUN: elf-dump --dump-section-data | FileCheck -check-prefix=OBJ %s
; RUN: llc %s -mtriple=armv7-linux-gnueabi -arm-use-movt -o - | \
; RUN: FileCheck -check-prefix=ASM %s
@dummy = internal global i32 666
@array00 = internal global [20 x i32] zeroinitializer
@sum = internal global i32 55
@STRIDE = internal global i32 8
; ASM: .type array00,%object @ @array00
; ASM-NEXT: .lcomm array00,80 @ @array00
; ASM-NEXT: .type _MergedGlobals,%object @ @_MergedGlobals
; OBJ: Section 0x00000003
; OBJ-NEXT: '.bss'
; OBJ: 'array00'
; OBJ-NEXT: 'st_value', 0x00000000
; OBJ-NEXT: 'st_size', 0x00000050
; OBJ-NEXT: 'st_bind', 0x00000000
; OBJ-NEXT: 'st_type', 0x00000001
; OBJ-NEXT: 'st_other', 0x00000000
; OBJ-NEXT: 'st_shndx', 0x00000003
define i32 @main(i32 %argc) nounwind {
%1 = load i32* @sum, align 4
%2 = getelementptr [20 x i32]* @array00, i32 0, i32 %argc
%3 = load i32* %2, align 4
%4 = add i32 %1, %3
ret i32 %4;
}