RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

[RuntimeDyld] Revert r279182 and 279201 -- they broke some ARM bots.

Browse Source 
llvm-svn: 279275
This commit is contained in:
Lang Hames 2016-08-19 17:06:39 +00:00
parent 2a0f74a4bf
commit 072ba9f3b4
11 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,9 +480,6 @@ void RuntimeDyldELF::resolveARMRelocation(const SectionEntry &Section,
*TargetPtr |= Value & 0xFFF; *TargetPtr |= Value & 0xFFF;
*TargetPtr |= ((Value >> 12) & 0xF) << 16; *TargetPtr |= ((Value >> 12) & 0xF) << 16;
break; break;
case ELF::R_ARM_REL32:
*TargetPtr += Value - FinalAddress;
break;
// Write 24 bit relative value to the branch instruction. // Write 24 bit relative value to the branch instruction.
case ELF::R_ARM_PC24: // Fall through. case ELF::R_ARM_PC24: // Fall through.
case ELF::R_ARM_CALL: // Fall through. case ELF::R_ARM_CALL: // Fall through.
@ -1368,19 +1365,6 @@ RuntimeDyldELF::processRelocationRef(
RelType, 0); RelType, 0);
Section.advanceStubOffset(getMaxStubSize()); Section.advanceStubOffset(getMaxStubSize());
} }
} else if (RelType == ELF::R_ARM_GOT_PREL) {
uint32_t GOTOffset = allocateGOTEntries(SectionID, 1);
RelocationEntry GOTRE(SectionID, Offset, ELF::R_ARM_REL32, GOTOffset);
addRelocationForSection(GOTRE, GOTSectionID);
// Fill in the value of the symbol we're targeting into the GOT
RelocationEntry RE = computeGOTOffsetRE(SectionID, GOTOffset,
Value.Offset, ELF::R_ARM_ABS32);
if (Value.SymbolName)
addRelocationForSymbol(RE, Value.SymbolName);
else
addRelocationForSection(RE, Value.SectionID);
} else { } else {
uint32_t *Placeholder = uint32_t *Placeholder =
reinterpret_cast<uint32_t*>(computePlaceholderAddress(SectionID, Offset)); reinterpret_cast<uint32_t*>(computePlaceholderAddress(SectionID, Offset));

2
test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
View File

@ -1,6 +1,6 @@
; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -relocation-model=pic -code-model=small %s > /dev/null ; RUN: -relocation-model=pic -code-model=small %s > /dev/null
; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
; UNSUPPORTED: powerpc64-unknown-linux-gnu ; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed

2
test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
View File

@ -1,6 +1,6 @@
; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -O0 -relocation-model=pic -code-model=small %s ; RUN: -O0 -relocation-model=pic -code-model=small %s
; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
; UNSUPPORTED: powerpc64-unknown-linux-gnu ; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed

2
test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
; XFAIL: mips-, mipsel-, i686, i386, aarch64 ; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
define i32 @main() nounwind { define i32 @main() nounwind {
entry: entry:

2
test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
; XFAIL: mips-, mipsel-, aarch64, i686, i386 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@count = global i32 1, align 4 @count = global i32 1, align 4

2
test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli -O0 -relocation-model=pic -code-model=small %s ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s
; XFAIL: mips-, mipsel-, aarch64, i686, i386 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
@ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4

2
test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll
View File

@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -relocation-model=pic -code-model=small %s > /dev/null ; RUN: -relocation-model=pic -code-model=small %s > /dev/null
; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
; UNSUPPORTED: powerpc64-unknown-linux-gnu ; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed

2
test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll
View File

@ -1,6 +1,6 @@
; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
; RUN: -O0 -relocation-model=pic -code-model=small %s ; RUN: -O0 -relocation-model=pic -code-model=small %s
; XFAIL: mips-, mipsel-, aarch64, i686, i386, mingw32, win32 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, mingw32, win32
; UNSUPPORTED: powerpc64-unknown-linux-gnu ; UNSUPPORTED: powerpc64-unknown-linux-gnu
; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed

2
test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s ; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
; XFAIL: mips-, mipsel-, i686, i386, aarch64 ; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm
define i32 @main() nounwind { define i32 @main() nounwind {
entry: entry:

2
test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null
; XFAIL: mips-, mipsel-, aarch64, i686, i386 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@count = global i32 1, align 4 @count = global i32 1, align 4

2
test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s ; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s
; XFAIL: mips-, mipsel-, aarch64, i686, i386 ; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
@ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4