<div dir="ltr">Thanks. Committed r293674 which includes this change and a followup build fix.<div><br></div><div>Peter</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 31, 2017 at 10:46 AM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Sgtm.<br>
<br>
Peter, go ahead and commit it to the branch (or let me know, and I'll do it).<br>
<div class="HOEnZb"><div class="h5"><br>
On Mon, Jan 30, 2017 at 4:38 PM, Rui Ueyama via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Yes please.<br>
><br>
> On Jan 30, 2017 10:32 AM, "Peter Collingbourne" <<a href="mailto:peter@pcc.me.uk">peter@pcc.me.uk</a>> wrote:<br>
>><br>
>> ruiu: OK to backport this to the 4.0 branch?<br>
>><br>
>> Peter<br>
>><br>
>> On Mon, Jan 30, 2017 at 10:20 AM, Peter Collingbourne via llvm-commits<br>
>> <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
>>><br>
>>> Author: pcc<br>
>>> Date: Mon Jan 30 12:20:07 2017<br>
>>> New Revision: 293519<br>
>>><br>
>>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=293519&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=293519&view=rev</a><br>
>>> Log:<br>
>>> ELF: Align RELRO to the target page size rather than the max page size.<br>
>>><br>
>>> If no bss sections appear after the relro segment, the loader will round<br>
>>> the r/w segment size to the target's page size. Align the relro size in<br>
>>> the<br>
>>> same way to ensure that it does not extend past the end of the program's<br>
>>> own memory region.<br>
>>><br>
>>> Differential Revision: <a href="https://reviews.llvm.org/D29242" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D29242</a><br>
>>><br>
>>> Added:<br>
>>>     lld/trunk/test/ELF/aarch64-<wbr>relro.s<br>
>>> Modified:<br>
>>>     lld/trunk/ELF/Writer.cpp<br>
>>><br>
>>> Modified: lld/trunk/ELF/Writer.cpp<br>
>>> URL:<br>
>>> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=293519&r1=293518&r2=293519&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/ELF/Writer.<wbr>cpp?rev=293519&r1=293518&r2=<wbr>293519&view=diff</a><br>
>>><br>
>>> ==============================<wbr>==============================<wbr>==================<br>
>>> --- lld/trunk/ELF/Writer.cpp (original)<br>
>>> +++ lld/trunk/ELF/Writer.cpp Mon Jan 30 12:20:07 2017<br>
>>> @@ -1498,7 +1498,7 @@ template <class ELFT> void Writer<ELFT>:<br>
>>>        // The glibc dynamic loader rounds the size down, so we need to<br>
>>> round up<br>
>>>        // to protect the last page. This is a no-op on FreeBSD which<br>
>>> always<br>
>>>        // rounds up.<br>
>>> -      P.p_memsz = alignTo(P.p_memsz, Config->MaxPageSize);<br>
>>> +      P.p_memsz = alignTo(P.p_memsz, Target->PageSize);<br>
>>>      }<br>
>>><br>
>>>      // The TLS pointer goes after PT_TLS. At least glibc will align it,<br>
>>><br>
>>> Added: lld/trunk/test/ELF/aarch64-<wbr>relro.s<br>
>>> URL:<br>
>>> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-relro.s?rev=293519&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/test/ELF/<wbr>aarch64-relro.s?rev=293519&<wbr>view=auto</a><br>
>>><br>
>>> ==============================<wbr>==============================<wbr>==================<br>
>>> --- lld/trunk/test/ELF/aarch64-<wbr>relro.s (added)<br>
>>> +++ lld/trunk/test/ELF/aarch64-<wbr>relro.s Mon Jan 30 12:20:07 2017<br>
>>> @@ -0,0 +1,13 @@<br>
>>> +# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-<wbr>freebsd %s -o %t<br>
>>> +# RUN: ld.lld %t -o %t2<br>
>>> +# RUN: llvm-readobj -program-headers %t2 | FileCheck %s<br>
>>> +<br>
>>> +# CHECK:      Type: PT_GNU_RELRO<br>
>>> +# CHECK-NEXT: Offset:<br>
>>> +# CHECK-NEXT: VirtualAddress:<br>
>>> +# CHECK-NEXT: PhysicalAddress:<br>
>>> +# CHECK-NEXT: FileSize:<br>
>>> +# CHECK-NEXT: MemSize: 4096<br>
>>> +<br>
>>> +.section .<a href="http://data.rel.ro" rel="noreferrer" target="_blank">data.rel.ro</a>,"aw",%progbits<br>
>>> +.byte 1<br>
>>><br>
>>><br>
>>> ______________________________<wbr>_________________<br>
>>> llvm-commits mailing list<br>
>>> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
>>> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
>><br>
>><br>
>><br>
>><br>
>> --<br>
>> --<br>
>> Peter<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr">-- <div>Peter</div></div></div>
</div>