6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-20 10:30:03 +00:00
Code Issues Projects Releases Wiki Activity

PowerPC: Fix eh_frame relocation for PIC

Browse Source 
This patch fixes the PPC eh_frame definitions for the personality and 
frame unwinding for PIC objects. It makes PIC build correctly creates
relative relocations in the '.rela.eh_frame' segments and thus avoiding
a text relocation that generates a DT_TEXTREL segments in link phase.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171506 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Adhemerval Zanella 2013-01-04 19:08:13 +00:00
parent 13410a11e7
commit 7b449889e7
5 changed files with 93 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Support/ELF.h
View File

@ -464,6 +464,7 @@ enum {
// ELF Relocation types for PPC64 // ELF Relocation types for PPC64
enum { enum {
R_PPC64_ADDR32 = 1,
R_PPC64_ADDR16_LO = 4, R_PPC64_ADDR16_LO = 4,
R_PPC64_ADDR16_HI = 5, R_PPC64_ADDR16_HI = 5,
R_PPC64_ADDR14 = 7, R_PPC64_ADDR14 = 7,
@ -471,6 +472,7 @@ enum {
R_PPC64_ADDR64 = 38, R_PPC64_ADDR64 = 38,
R_PPC64_ADDR16_HIGHER = 39, R_PPC64_ADDR16_HIGHER = 39,
R_PPC64_ADDR16_HIGHEST = 41, R_PPC64_ADDR16_HIGHEST = 41,
R_PPC64_REL64 = 44,
R_PPC64_TOC16 = 47, R_PPC64_TOC16 = 47,
R_PPC64_TOC16_LO = 48, R_PPC64_TOC16_LO = 48,
R_PPC64_TOC16_HA = 50, R_PPC64_TOC16_HA = 50,

6
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
View File

@ -517,6 +517,12 @@ void RuntimeDyldELF::resolvePPC64Relocation(const SectionEntry &Section,
uint8_t aalk = *(LocalAddress+3); uint8_t aalk = *(LocalAddress+3);
writeInt16BE(LocalAddress + 2, (aalk & 3) | ((Value + Addend) & 0xfffc)); writeInt16BE(LocalAddress + 2, (aalk & 3) | ((Value + Addend) & 0xfffc));
} break; } break;
case ELF::R_PPC64_ADDR32 : {
int32_t Result = static_cast<int32_t>(Value + Addend);
if (SignExtend32<32>(Result) != Result)
llvm_unreachable("Relocation R_PPC64_REL32 overflow");
writeInt32BE(LocalAddress, Result);
} break;
case ELF::R_PPC64_REL24 : { case ELF::R_PPC64_REL24 : {
uint64_t FinalAddress = (Section.LoadAddress + Offset); uint64_t FinalAddress = (Section.LoadAddress + Offset);
int32_t delta = static_cast<int32_t>(Value - FinalAddress + Addend); int32_t delta = static_cast<int32_t>(Value - FinalAddress + Addend);

11
lib/MC/MCObjectFileInfo.cpp
View File

@ -256,6 +256,17 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
TTypeEncoding = (CMModel == CodeModel::Small) TTypeEncoding = (CMModel == CodeModel::Small)
? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr; ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr;
} }
} else if (T.getArch() == Triple::ppc64) {
PersonalityEncoding = dwarf::DW_EH_PE_udata8;
PersonalityEncoding |= (RelocM == Reloc::PIC_)
? dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel
: dwarf::DW_EH_PE_absptr;
unsigned PICFlag = (RelocM == Reloc::PIC_) ? dwarf::DW_EH_PE_pcrel
: dwarf::DW_EH_PE_absptr;
FDECFIEncoding = PICFlag | dwarf::DW_EH_PE_sdata4;
LSDAEncoding = PICFlag | dwarf::DW_EH_PE_udata8;
FDEEncoding = PICFlag | dwarf::DW_EH_PE_sdata4;
TTypeEncoding = PICFlag | dwarf::DW_EH_PE_sdata4;
} }
// Solaris requires different flags for .eh_frame to seemingly every other // Solaris requires different flags for .eh_frame to seemingly every other

5
lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
View File

@ -77,9 +77,14 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target,
case PPC::fixup_ppc_br24: case PPC::fixup_ppc_br24:
Type = ELF::R_PPC_REL24; Type = ELF::R_PPC_REL24;
break; break;
case FK_Data_4:
case FK_PCRel_4: case FK_PCRel_4:
Type = ELF::R_PPC_REL32; Type = ELF::R_PPC_REL32;
break; break;
case FK_Data_8:
case FK_PCRel_8:
Type = ELF::R_PPC64_REL64;
break;
} }
} else { } else {
switch ((unsigned)Fixup.getKind()) { switch ((unsigned)Fixup.getKind()) {

101
test/MC/PowerPC/ppc64-initial-cfa.ll
View File

@ -1,41 +1,78 @@
;; RUN: llc -mtriple=powerpc64-unknown-linux-gnu -filetype=obj %s -o - | \ ; RUN: llc -mtriple=powerpc64-unknown-linux-gnu -filetype=obj -relocation-model=static %s -o - | \
;; RUN: elf-dump --dump-section-data | FileCheck %s ; RUN: elf-dump --dump-section-data | FileCheck %s -check-prefix=STATIC
; RUN: llc -mtriple=powerpc64-unknown-linux-gnu -filetype=obj -relocation-model=pic %s -o - | \
; RUN: elf-dump --dump-section-data | FileCheck %s -check-prefix=PIC
;; FIXME: this file should be in .s form, change when asm parser is available. ; FIXME: this file should be in .s form, change when asm parser is available.
define void @f() { define void @f() {
entry: entry:
ret void ret void
} }
;; CHECK: ('sh_name', 0x{{.*}}) # '.eh_frame' ; STATIC: ('sh_name', 0x{{.*}}) # '.eh_frame'
;; CHECK-NEXT: ('sh_type', 0x00000001) ; STATIC-NEXT: ('sh_type', 0x00000001)
;; CHECK-NEXT: ('sh_flags', 0x0000000000000002) ; STATIC-NEXT: ('sh_flags', 0x0000000000000002)
;; CHECK-NEXT: ('sh_addr', 0x{{.*}}) ; STATIC-NEXT: ('sh_addr', 0x{{.*}})
;; CHECK-NEXT: ('sh_offset', 0x{{.*}}) ; STATIC-NEXT: ('sh_offset', 0x{{.*}})
;; CHECK-NEXT: ('sh_size', 0x0000000000000030) ; STATIC-NEXT: ('sh_size', 0x0000000000000028)
;; CHECK-NEXT: ('sh_link', 0x00000000) ; STATIC-NEXT: ('sh_link', 0x00000000)
;; CHECK-NEXT: ('sh_info', 0x00000000) ; STATIC-NEXT: ('sh_info', 0x00000000)
;; CHECK-NEXT: ('sh_addralign', 0x0000000000000008) ; STATIC-NEXT: ('sh_addralign', 0x0000000000000008)
;; CHECK-NEXT: ('sh_entsize', 0x0000000000000000) ; STATIC-NEXT: ('sh_entsize', 0x0000000000000000)
;; CHECK-NEXT: ('_section_data', '00000010 00000000 017a5200 01784101 000c0100 00000018 00000018 00000000 00000000 00000000 00000010 00000000') ; STATIC-NEXT: ('_section_data', '00000010 00000000 017a5200 01784101 0b0c0100 00000010 00000018 00000000 00000010 00000000')
;; CHECK: ('sh_name', 0x{{.*}}) # '.rela.eh_frame' ; STATIC: ('sh_name', 0x{{.*}}) # '.rela.eh_frame'
;; CHECK-NEXT: ('sh_type', 0x00000004) ; STATIC-NEXT: ('sh_type', 0x00000004)
;; CHECK-NEXT: ('sh_flags', 0x0000000000000000) ; STATIC-NEXT: ('sh_flags', 0x0000000000000000)
;; CHECK-NEXT: ('sh_addr', 0x{{.*}}) ; STATIC-NEXT: ('sh_addr', 0x{{.*}})
;; CHECK-NEXT: ('sh_offset', 0x{{.*}}) ; STATIC-NEXT: ('sh_offset', 0x{{.*}})
;; CHECK-NEXT: ('sh_size', 0x0000000000000018) ; STATIC-NEXT: ('sh_size', 0x0000000000000018)
;; CHECK-NEXT: ('sh_link', 0x{{.*}}) ; STATIC-NEXT: ('sh_link', 0x{{.*}})
;; CHECK-NEXT: ('sh_info', 0x{{.*}}) ; STATIC-NEXT: ('sh_info', 0x{{.*}})
;; CHECK-NEXT: ('sh_addralign', 0x0000000000000008) ; STATIC-NEXT: ('sh_addralign', 0x0000000000000008)
;; CHECK-NEXT: ('sh_entsize', 0x0000000000000018) ; STATIC-NEXT: ('sh_entsize', 0x0000000000000018)
;; CHECK-NEXT: ('_relocations', [ ; STATIC-NEXT: ('_relocations', [
;; CHECK-NEXT: # Relocation 0
;; CHECK-NEXT: (('r_offset', 0x000000000000001c)
;; CHECK-NEXT: ('r_sym', 0x{{.*}})
;; CHECK-NEXT: ('r_type', 0x00000026)
;; CHECK-NEXT: ('r_addend', 0x0000000000000000)
;; CHECK-NEXT: ),
;; CHECK-NEXT: ])
; Static build should create R_PPC64_ADDR32 relocations
; STATIC-NEXT: # Relocation 0
; STATIC-NEXT: (('r_offset', 0x000000000000001c)
; STATIC-NEXT: ('r_sym', 0x{{.*}})
; STATIC-NEXT: ('r_type', 0x00000001)
; STATIC-NEXT: ('r_addend', 0x0000000000000000)
; STATIC-NEXT: ),
; STATIC-NEXT: ])
; PIC: ('sh_name', 0x{{.*}}) # '.eh_frame'
; PIC-NEXT: ('sh_type', 0x00000001)
; PIC-NEXT: ('sh_flags', 0x0000000000000002)
; PIC-NEXT: ('sh_addr', 0x{{.*}})
; PIC-NEXT: ('sh_offset', 0x{{.*}})
; PIC-NEXT: ('sh_size', 0x0000000000000028)
; PIC-NEXT: ('sh_link', 0x00000000)
; PIC-NEXT: ('sh_info', 0x00000000)
; PIC-NEXT: ('sh_addralign', 0x0000000000000008)
; PIC-NEXT: ('sh_entsize', 0x0000000000000000)
; PIC-NEXT: ('_section_data', '00000010 00000000 017a5200 01784101 1b0c0100 00000010 00000018 00000000 00000010 00000000')
; PIC: ('sh_name', 0x{{.*}}) # '.rela.eh_frame'
; PIC-NEXT: ('sh_type', 0x00000004)
; PIC-NEXT: ('sh_flags', 0x0000000000000000)
; PIC-NEXT: ('sh_addr', 0x{{.*}})
; PIC-NEXT: ('sh_offset', 0x{{.*}})
; PIC-NEXT: ('sh_size', 0x0000000000000018)
; PIC-NEXT: ('sh_link', 0x{{.*}})
; PIC-NEXT: ('sh_info', 0x{{.*}})
; PIC-NEXT: ('sh_addralign', 0x0000000000000008)
; PIC-NEXT: ('sh_entsize', 0x0000000000000018)
; PIC-NEXT: ('_relocations', [
; PIC build should create R_PPC64_REL32 relocations
; PIC-NEXT: # Relocation 0
; PIC-NEXT: (('r_offset', 0x000000000000001c)
; PIC-NEXT: ('r_sym', 0x{{.*}})
; PIC-NEXT: ('r_type', 0x0000001a)
; PIC-NEXT: ('r_addend', 0x0000000000000000)
; PIC-NEXT: ),
; PIC-NEXT: ])