diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-02-04 12:18:36 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-02-04 12:18:36 +0000 |
| commit | cb437e48ab7ddd9b85843beb524904ee4b565721 (patch) | |
| tree | 56b81401aaec347d689102972d028010fd35e8ba /linux-user/qemu.h | |
| parent | 2944e4ece235c74dcce3aa11c456f3645ae594fc (diff) | |
| parent | f78b0f05414f911d36afcd52f2330574d5a21952 (diff) | |
| download | focaccia-qemu-cb437e48ab7ddd9b85843beb524904ee4b565721.tar.gz focaccia-qemu-cb437e48ab7ddd9b85843beb524904ee4b565721.zip | |
Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu
* 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu: linux-user: Fix sa_flags byte swaps for mips linux-user: Define TARGET_QEMU_ESIGRETURN for mips64 linux-user: Define TARGET_QEMU_ESIGRETURN for mipsn32 linux-user: Add default configs for mips64[el] linux-user: Add default-configs for mipsn32[el] linux-user: Implement *listxattr syscalls linux-user/syscall.c: Implement f and l versions of set/get/removexattr linux-user: Allow NULL value pointer in setxattr and getxattr linux-user: fix wait* syscall status returns linux-user/strace.c: Correct errno printing for mmap etc linux-user: fix QEMU_STRACE=1 segfault linux-user: add SO_PEERCRED support for getsockopt linux-user/main.c: Add option to user-mode emulation so that user can specify log file name linux-user: fake /proc/self/auxv linux-user: fake /proc/self/stat linux-user: fake /proc/self/maps linux-user: add open() hijack infrastructure linux-user: save auxv length linux-user: stack_base is now mandatory on all targets
Diffstat (limited to 'linux-user/qemu.h')
| -rw-r--r-- | linux-user/qemu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 55ad9d8586..308dbc025b 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -48,6 +48,7 @@ struct image_info { abi_ulong code_offset; abi_ulong data_offset; abi_ulong saved_auxv; + abi_ulong auxv_len; abi_ulong arg_start; abi_ulong arg_end; int personality; @@ -123,10 +124,10 @@ typedef struct TaskState { #endif #if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) /* Extra fields for semihosted binaries. */ - uint32_t stack_base; uint32_t heap_base; uint32_t heap_limit; #endif + uint32_t stack_base; int used; /* non zero if used */ struct image_info *info; struct linux_binprm *bprm; |