maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Produce a R_386_PLT32 when needed. Moved the default cases of switches to the 

start for consistency.

llvm-svn: 116715
This commit is contained in:
Rafael Espindola 2010-10-18 16:58:03 +00:00
parent 00fe92da6b
commit 3521f8467d
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -639,6 +639,8 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
if (Is64Bit) {
if (IsPCRel) {
switch (Modifier) {
default:
llvm_unreachable("Unimplemented");
case MCSymbolRefExpr::VK_None:
Type = ELF::R_X86_64_PC32;
break;
@ -648,8 +650,6 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
case llvm::MCSymbolRefExpr::VK_GOTPCREL:
Type = ELF::R_X86_64_GOTPCREL;
break;
default:
llvm_unreachable("Unimplemented");
}
} else {
switch ((unsigned)Fixup.getKind()) {
@ -659,6 +659,8 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
case X86::reloc_pcrel_4byte:
assert(isInt<32>(Target.getConstant()));
switch (Modifier) {
default:
llvm_unreachable("Unimplemented");
case MCSymbolRefExpr::VK_None:
Type = ELF::R_X86_64_32S;
break;
@ -668,8 +670,6 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
case MCSymbolRefExpr::VK_GOTPCREL:
Type = ELF::R_X86_64_GOTPCREL;
break;
default:
llvm_unreachable("Unimplemented");
}
break;
case FK_Data_4:
@ -682,7 +682,13 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
}
} else {
if (IsPCRel) {
Type = ELF::R_386_PC32;
switch (Modifier) {
default:
llvm_unreachable("Unimplemented");
case MCSymbolRefExpr::VK_PLT:
Type = ELF::R_386_PLT32;
break;
}
} else {
switch ((unsigned)Fixup.getKind()) {
default: llvm_unreachable("invalid fixup kind!");
@ -692,11 +698,11 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
case X86::reloc_signed_4byte:
case X86::reloc_pcrel_4byte:
switch (Modifier) {
default:
llvm_unreachable("Unimplemented");
case MCSymbolRefExpr::VK_GOTOFF:
Type = ELF::R_386_GOTOFF;
break;
default:
llvm_unreachable("Unimplemented");
}
break;
case FK_Data_4: Type = ELF::R_386_32; break;

16
llvm/test/MC/ELF/relocation-386.s
View File

@ -1,7 +1,7 @@
// RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -o - | elf-dump | FileCheck %s
// Test that we produce a GOTOFF and that the relocation uses the symbol and not
// the section.
// Test that we produce the correct relocation types and that the relocation
// to .Lfoo uses the symbol and not the section.
// CHECK: # Symbol 1
@ -11,10 +11,20 @@
// CHECK-NEXT: (('r_offset', 2)
// CHECK-NEXT: ('r_sym', 1)
// CHECK-NEXT: ('r_type', 9)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 1
// CHECK-NEXT: (('r_offset',
// CHECK-NEXT: ('r_sym',
// CHECK-NEXT: ('r_type', 4)
.text
bar:
leal .Lfoo@GOTOFF(%ebx), %eax
.section .rodata.str1.16,"aMS",@progbits,1
.global bar2
bar2:
calll bar2@PLT
.section .rodata.str1.16,"aMS",@progbits,1
.Lfoo:
.asciz "bool llvm::llvm_start_multithreaded()"