| Message ID | 20230410182056.320-20-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user 2023 Q2 first batch | expand |
On 4/10/23 11:20, Warner Losh wrote: > It's enabled on all platforms (even in the fork), so we can remove it > from here. > > Signed-off-by: Warner Losh<imp@bsdimp.com> > --- > bsd-user/arm/target_arch_elf.h | 1 - > bsd-user/elfcore.c | 3 --- > bsd-user/elfload.c | 5 ----- > bsd-user/i386/target_arch_elf.h | 1 - > bsd-user/x86_64/target_arch_elf.h | 1 - > 5 files changed, 11 deletions(-) Thanks, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h index 935bce347fc..9f963d4747f 100644 --- a/bsd-user/arm/target_arch_elf.h +++ b/bsd-user/arm/target_arch_elf.h @@ -29,7 +29,6 @@ #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_ARM -#define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 #define ELF_HWCAP get_elf_hwcap() diff --git a/bsd-user/elfcore.c b/bsd-user/elfcore.c index 2905f2b8414..606c42dd4ab 100644 --- a/bsd-user/elfcore.c +++ b/bsd-user/elfcore.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#ifdef USE_ELF_CORE_DUMP #include <err.h> #include <libgen.h> #include <sys/mman.h> @@ -1318,5 +1317,3 @@ out: } return 0; } - -#endif /* USE_ELF_CORE_DUMP */ diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index fbcdc94b960..0477d243a4b 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -35,7 +35,6 @@ static size_t target_auxents_sz; /* Size of AUX entries including AT_NULL */ abi_ulong target_stksiz; abi_ulong target_stkbas; -static int elf_core_dump(int signr, CPUArchState *env); static int load_elf_sections(const struct elfhdr *hdr, struct elf_phdr *phdr, int fd, abi_ulong rbase, abi_ulong *baddrp); @@ -818,11 +817,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, info->entry = elf_entry; -#ifdef USE_ELF_CORE_DUMP bprm->core_dump = &elf_core_dump; -#else - bprm->core_dump = NULL; -#endif return 0; } diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h index cbcd1f08e2f..a18124f0f29 100644 --- a/bsd-user/i386/target_arch_elf.h +++ b/bsd-user/i386/target_arch_elf.h @@ -30,7 +30,6 @@ #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 -#define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 #endif /* TARGET_ARCH_ELF_H */ diff --git a/bsd-user/x86_64/target_arch_elf.h b/bsd-user/x86_64/target_arch_elf.h index b2447118883..08abe62be6f 100644 --- a/bsd-user/x86_64/target_arch_elf.h +++ b/bsd-user/x86_64/target_arch_elf.h @@ -30,7 +30,6 @@ #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_X86_64 -#define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 #endif /* TARGET_ARCH_ELF_H */
It's enabled on all platforms (even in the fork), so we can remove it from here. Signed-off-by: Warner Losh <imp@bsdimp.com> --- bsd-user/arm/target_arch_elf.h | 1 - bsd-user/elfcore.c | 3 --- bsd-user/elfload.c | 5 ----- bsd-user/i386/target_arch_elf.h | 1 - bsd-user/x86_64/target_arch_elf.h | 1 - 5 files changed, 11 deletions(-)