<html><body><p>Hi Steven,<br><br>Thanks for fixing it quickly. In the future I will check if a lit config is needed.<br><br>Bryan<br><br><br><br><img width="16" height="16" src="cid:1__=8FBBF521DFE03C3A8f9e8a93df938690918c8FB@" border="0" alt="Inactive hide details for Steven Wu ---2016-05-13 04:17:33 PM---Should be fixed in r269470. Disable the test if the backend is "><font color="#424282">Steven Wu ---2016-05-13 04:17:33 PM---Should be fixed in r269470. Disable the test if the backend is not built. Steven</font><br><br><font size="2" color="#5F5F5F">From: </font><font size="2">Steven Wu <stevenwu@apple.com></font><br><font size="2" color="#5F5F5F">To: </font><font size="2">Bryan Chan/Toronto/IBM@IBMCA</font><br><font size="2" color="#5F5F5F">Cc: </font><font size="2">llvm-commits@lists.llvm.org</font><br><font size="2" color="#5F5F5F">Date: </font><font size="2">2016-05-13 04:17 PM</font><br><font size="2" color="#5F5F5F">Subject: </font><font size="2">Re: [llvm] r269436 - [RuntimeDyld] Support R_390_PC64 relocation type</font><br><font size="2" color="#5F5F5F">Sent by: </font><font size="2">stevenwu@apple.com</font><br><hr width="100%" size="2" align="left" noshade style="color:#8091A5; "><br><br><br><tt>Should be fixed in r269470. Disable the test if the backend is not built.<br><br>Steven<br><br>> On May 13, 2016, at 12:17 PM, Steven Wu <stevenwu@apple.com> wrote:<br>> <br>> Hi Bryan<br>> <br>> The test is failing on Darwin bots: </tt><tt><a href="http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_check/18126/testReport/junit/LLVM/ExecutionEngine_RuntimeDyld_SystemZ/cfi_relo_pc64_s/">http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_check/18126/testReport/junit/LLVM/ExecutionEngine_RuntimeDyld_SystemZ/cfi_relo_pc64_s/</a></tt><tt><br>> Can you take a look? <br>> <br>> Thanks<br>> <br>> Steven<br>> <br>>> On May 13, 2016, at 10:23 AM, Bryan Chan via llvm-commits <llvm-commits@lists.llvm.org> wrote:<br>>> <br>>> Author: bryanpkc<br>>> Date: Fri May 13 12:23:48 2016<br>>> New Revision: 269436<br>>> <br>>> URL: </tt><tt><a href="http://llvm.org/viewvc/llvm-project?rev=269436&view=rev">http://llvm.org/viewvc/llvm-project?rev=269436&view=rev</a></tt><tt><br>>> Log:<br>>> [RuntimeDyld] Support R_390_PC64 relocation type<br>>> <br>>> Summary: When the MCJIT generates ELF code, some DWARF data requires 64-bit PC-relative relocation (R_390_PC64). This patch adds support for R_390_PC64 relocation to RuntimeDyld::resolveSystemZRelocation, to avoid an assertion failure.<br>>> <br>>> Reviewers: uweigand<br>>> <br>>> Subscribers: llvm-commits<br>>> <br>>> Differential Revision: </tt><tt><a href="http://reviews.llvm.org/D20033">http://reviews.llvm.org/D20033</a></tt><tt><br>>> <br>>> Added:<br>>> llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/<br>>> llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/<br>>> llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/rtdyld-globals.ll<br>>> llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s<br>>> Modified:<br>>> llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp<br>>> <br>>> Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp<br>>> URL: </tt><tt><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp?rev=269436&r1=269435&r2=269436&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp?rev=269436&r1=269435&r2=269436&view=diff</a></tt><tt><br>>> ==============================================================================<br>>> --- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp (original)<br>>> +++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Fri May 13 12:23:48 2016<br>>> @@ -1066,6 +1066,11 @@ void RuntimeDyldELF::resolveSystemZReloc<br>>> case ELF::R_390_64:<br>>> writeInt64BE(LocalAddress, Value + Addend);<br>>> break;<br>>> + case ELF::R_390_PC64: {<br>>> + int64_t Delta = (Value + Addend) - Section.getLoadAddressWithOffset(Offset);<br>>> + writeInt64BE(LocalAddress, Delta);<br>>> + break;<br>>> + }<br>>> }<br>>> }<br>>> <br>>> <br>>> Added: llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/rtdyld-globals.ll<br>>> URL: </tt><tt><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/rtdyld-globals.ll?rev=269436&view=auto">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/rtdyld-globals.ll?rev=269436&view=auto</a></tt><tt><br>>> ==============================================================================<br>>> --- llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/rtdyld-globals.ll (added)<br>>> +++ llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/Inputs/rtdyld-globals.ll Fri May 13 12:23:48 2016<br>>> @@ -0,0 +1 @@<br>>> +@foo = global i8 0<br>>> <br>>> Added: llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s<br>>> URL: </tt><tt><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s?rev=269436&view=auto">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s?rev=269436&view=auto</a></tt><tt><br>>> ==============================================================================<br>>> --- llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s (added)<br>>> +++ llvm/trunk/test/ExecutionEngine/RuntimeDyld/SystemZ/cfi-relo-pc64.s Fri May 13 12:23:48 2016<br>>> @@ -0,0 +1,32 @@<br>>> +// Test that R_390_PC32 and R_390_PC64 relocations can be generated.<br>>> +// RUN: llvm-mc -triple s390x-linux-gnu -relocation-model=pic -filetype=obj %s -o - | llvm-readobj -s -sr -sd | FileCheck %s<br>>> +<br>>> +// Test that RuntimeDyld can fix up such relocations.<br>>> +// RUN: llvm-mc -triple s390x-linux-gnu -relocation-model=pic -filetype=obj %s -o %T/test-s390x-cfi-relo-pc64.o<br>>> +// RUN: llc -mtriple=s390x-linux-gnu -relocation-model=pic -filetype=obj %S/Inputs/rtdyld-globals.ll -o %T/test-s390x-rtdyld-globals.o<br>>> +// RUN: llvm-rtdyld -triple=s390x-linux-gnu -verify %T/test-s390x-cfi-relo-pc64.o %T/test-s390x-rtdyld-globals.o<br>>> +<br>>> +f1:<br>>> + .cfi_startproc<br>>> + .cfi_personality 0x9c, foo // DW_EH_PE_indirect|DW_EH_PE_pcrel|DW_EH_PE_sdata8 (0x9c)<br>>> + lr %r0, %r0<br>>> + .cfi_endproc<br>>> +<br>>> +// CHECK: Section {<br>>> +// CHECK: Index:<br>>> +// CHECK: Name: .rela.eh_frame<br>>> +// CHECK-NEXT: Type: SHT_RELA<br>>> +// CHECK-NEXT: Flags [<br>>> +// CHECK-NEXT: ]<br>>> +// CHECK-NEXT: Address: 0x0<br>>> +// CHECK-NEXT: Offset:<br>>> +// CHECK-NEXT: Size: 48<br>>> +// CHECK-NEXT: Link:<br>>> +// CHECK-NEXT: Info:<br>>> +// CHECK-NEXT: AddressAlignment: 8<br>>> +// CHECK-NEXT: EntrySize: 24<br>>> +// CHECK-NEXT: Relocations [<br>>> +// CHECK-NEXT: 0x12 R_390_PC64 foo 0x0<br>>> +// CHECK-NEXT: 0x28 R_390_PC32 .text 0x0<br>>> +// CHECK-NEXT: ]<br>>> +// CHECK: }<br>>> <br>>> <br>>> _______________________________________________<br>>> llvm-commits mailing list<br>>> llvm-commits@lists.llvm.org<br>>> </tt><tt><a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a></tt><tt><br>> <br><br></tt><br><br><BR>
</body></html>