diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-18 17:26:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-21 10:34:40 +0100 |
| commit | 710259565bd4bd2beba6731d430ab3b701c0f96a (patch) | |
| tree | 8e62d40dc9ae01d94e7548e9666fcb330231fe47 | |
| parent | 06943a626964c3dabb3931cacc7180cd22fa7fda (diff) | |
bsd-user/elfload.c: Fix set-but-not-used warnings
Fix various warnings about set-but-not-used variables on OpenBSD:
bsd-user/elfload.c:1158:15: warning: variable 'mapped_addr' set but not used [-Wunused-but-set-variable]
bsd-user/elfload.c:1165:9: warning: variable 'status' set but not used [-Wunused-but-set-variable]
bsd-user/elfload.c:1168:15: warning: variable 'elf_stack' set but not used [-Wunused-but-set-variable]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1500395194-21455-3-git-send-email-peter.maydell@linaro.org
| -rw-r--r-- | bsd-user/elfload.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 41a1309296..7cccf3eb8b 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -1155,21 +1155,20 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, unsigned int interpreter_type = INTERPRETER_NONE; unsigned char ibcs2_interpreter; int i; - abi_ulong mapped_addr; struct elf_phdr * elf_ppnt; struct elf_phdr *elf_phdata; abi_ulong elf_bss, k, elf_brk; int retval; char * elf_interpreter; abi_ulong elf_entry, interp_load_addr = 0; - int status; abi_ulong start_code, end_code, start_data, end_data; abi_ulong reloc_func_desc = 0; - abi_ulong elf_stack; +#ifdef LOW_ELF_STACK + abi_ulong elf_stack = ~((abi_ulong)0UL); +#endif char passed_fileno[6]; ibcs2_interpreter = 0; - status = 0; load_addr = 0; load_bias = 0; elf_ex = *((struct elfhdr *) bprm->buf); /* exec-header */ @@ -1221,7 +1220,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, elf_brk = 0; - elf_stack = ~((abi_ulong)0UL); elf_interpreter = NULL; start_code = ~((abi_ulong)0UL); end_code = 0; @@ -1546,7 +1544,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, and some applications "depend" upon this behavior. Since we do not have the power to recompile these, we emulate the SVr4 behavior. Sigh. */ - mapped_addr = target_mmap(0, qemu_host_page_size, PROT_READ | PROT_EXEC, + target_mmap(0, qemu_host_page_size, PROT_READ | PROT_EXEC, MAP_FIXED | MAP_PRIVATE, -1, 0); } |