<div dir="ltr">It'd be nice if we can test this?</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 6, 2015 at 12:44 AM, Denis Protivensky <span dir="ltr"><<a href="mailto:dprotivensky@accesssoftek.com" target="_blank">dprotivensky@accesssoftek.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: denis-protivensky<br>
Date: Mon Apr  6 02:44:59 2015<br>
New Revision: 234144<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=234144&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=234144&view=rev</a><br>
Log:<br>
[AArch64] Fix error in AARCH64_ADR_GOT_PAGE handler<br>
<br>
The error was introduced during mechanical replacement<br>
of raw memory reads/writes to use readxxle/writexxle functions<br>
in r230725.<br>
<br>
Noted and fixed by Suprateeka R Hegde <<a href="mailto:hegdesmailbox@gmail.com">hegdesmailbox@gmail.com</a>><br>
<br>
Modified:<br>
    lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp?rev=234144&r1=234143&r2=234144&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp?rev=234144&r1=234143&r2=234144&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp Mon Apr  6 02:44:59 2015<br>
@@ -223,7 +223,7 @@ static void relocR_AARCH64_ADR_GOT_PAGE(<br>
         llvm::dbgs() << " immhi: " << Twine::utohexstr(immhi);<br>
         llvm::dbgs() << " immlo: " << Twine::utohexstr(immlo);<br>
         llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");<br>
-  write32le(location, result | read32le(location));<br>
+  write32le(location, immlo | immhi | read32le(location));<br>
 }<br>
<br>
 // R_AARCH64_LD64_GOT_LO12_NC<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>