diff options
| author | Peter Maydell | 2014-11-11 11:09:31 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-11-11 11:09:31 +0100 |
| commit | 59c4f2ecefe33878bc23219a51d0bd913d46aa97 (patch) | |
| tree | 96ff4c0a23e31a642bc3f483d1cdf83ed1763279 /linux-user/elfload.c | |
| parent | Merge remote-tracking branch 'remotes/xtensa/tags/20141110-xtensa' into staging (diff) | |
| parent | linux-user: Fix up timer id handling (diff) | |
| download | qemu-59c4f2ecefe33878bc23219a51d0bd913d46aa97.tar.gz qemu-59c4f2ecefe33878bc23219a51d0bd913d46aa97.tar.xz qemu-59c4f2ecefe33878bc23219a51d0bd913d46aa97.zip | |
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20141111' into staging
linux-user pull for 2.2
Two last minute fixes uncovered and fixed by Tom Musta
and Alexander Graf, thanks
# gpg: Signature made Tue 11 Nov 2014 06:36:02 GMT using RSA key ID DE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg: aka "Riku Voipio <riku.voipio@linaro.org>"
* remotes/riku/tags/pull-linux-user-20141111:
linux-user: Fix up timer id handling
linux-user: Do not subtract offset from end address
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/elfload.c')
| -rw-r--r-- | linux-user/elfload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 84123baa58..e2596a4201 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1824,7 +1824,7 @@ static void load_elf_image(const char *image_name, int image_fd, if (a < loaddr) { loaddr = a; } - a += phdr[i].p_memsz; + a = phdr[i].p_vaddr + phdr[i].p_memsz; if (a > hiaddr) { hiaddr = a; } |