[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for 6.2 31/49] bsd-user: Remove dead #ifdefs from elfload.c
From: |
Warner Losh |
Subject: |
[PATCH for 6.2 31/49] bsd-user: Remove dead #ifdefs from elfload.c |
Date: |
Sat, 7 Aug 2021 15:42:24 -0600 |
From: Warner Losh <imp@FreeBSD.org>
LOW_ELF_STACK doesn't exist on FreeBSD and likely never will. Remove it.
Likewise, remove an #if 0 block that's not useful
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/elfload.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index a09f8fb315..c0787a4e52 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -558,9 +558,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
target_pt_regs *regs,
abi_ulong elf_entry, interp_load_addr = 0;
abi_ulong start_code, end_code, start_data, end_data;
abi_ulong reloc_func_desc = 0;
-#ifdef LOW_ELF_STACK
- abi_ulong elf_stack = ~((abi_ulong)0UL);
-#endif
load_addr = 0;
load_bias = 0;
@@ -761,11 +758,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
target_pt_regs *regs,
exit(-1);
}
-#ifdef LOW_ELF_STACK
- if (TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr) < elf_stack)
- elf_stack = TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr);
-#endif
-
if (!load_addr_set) {
load_addr_set = 1;
load_addr = elf_ppnt->p_vaddr - elf_ppnt->p_offset;
@@ -823,9 +815,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
target_pt_regs *regs,
close(bprm->fd);
-#ifdef LOW_ELF_STACK
- info->start_stack = bprm->p = elf_stack - 4;
-#endif
bprm->p = target_create_elf_tables(bprm->p, bprm->argc, bprm->envc,
bprm->stringp,
&elf_ex, load_addr, load_bias,
interp_load_addr, info);
info->load_addr = reloc_func_desc;
@@ -842,15 +831,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct
target_pt_regs *regs,
padzero(elf_bss, elf_brk);
-#if 0
- printf("(start_brk) %x\n" , info->start_brk);
- printf("(end_code) %x\n" , info->end_code);
- printf("(start_code) %x\n" , info->start_code);
- printf("(end_data) %x\n" , info->end_data);
- printf("(start_stack) %x\n" , info->start_stack);
- printf("(brk) %x\n" , info->brk);
-#endif
-
info->entry = elf_entry;
return 0;
--
2.32.0
- [PATCH for 6.2 26/49] bsd-user: Create target specific vmparam.h, (continued)
- [PATCH for 6.2 26/49] bsd-user: Create target specific vmparam.h, Warner Losh, 2021/08/07
- [PATCH for 6.2 29/49] bsd-user: Add system independent stack, data and text limiting, Warner Losh, 2021/08/07
- [PATCH for 6.2 28/49] bsd-user: Move stack initializtion into a per-os file., Warner Losh, 2021/08/07
- [PATCH for 6.2 30/49] bsd-user: elf cleanup, Warner Losh, 2021/08/07
- [PATCH for 6.2 31/49] bsd-user: Remove dead #ifdefs from elfload.c,
Warner Losh <=
- [PATCH for 6.2 32/49] bsd-user: *BSD specific siginfo defintions, Warner Losh, 2021/08/07
- [PATCH for 6.2 33/49] bsd-user: Rewrite target system call definintion glue, Warner Losh, 2021/08/07
- [PATCH for 6.2 34/49] bsd-user: Fix initializtion of task state, Warner Losh, 2021/08/07
- [PATCH for 6.2 36/49] bsd-user: Make cpu_model and cpu_type visible to all of main.c, Warner Losh, 2021/08/07