commit fbaddda9f04fa504deb752bba819eb1fa5439baa
author Elliott Hughes <enh@google.com> Wed Feb 19 23:40:46 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 19 23:40:46 2014 +0000
tree c00038c9ee999043d93deb57fadc8f7ac9b76b91
parent b69c0b532e4f6d32e7c43a7be02a27e0b02e75c3
parent 006f9ad8910c945cd50e54f6c34d8c27b11c1193

Merge "Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP"

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index ead9bd4..156864c 100755
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1744,7 +1744,7 @@
         case DT_MIPS_RLD_MAP:
             // Set the DT_MIPS_RLD_MAP entry to the address of _r_debug for GDB.
             {
-              r_debug** dp = reinterpret_cast<r_debug**>(d->d_un.d_ptr);
+              r_debug** dp = reinterpret_cast<r_debug**>(base + d->d_un.d_ptr);
               *dp = &_r_debug;
             }
             break;