Now that all target_coredump.c.inc files have been created,
USE_ELF_CORE_DUMP signals that it is available.

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
 linux-user/elfload.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 347af3202c..6feab68a52 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -159,8 +159,6 @@ typedef abi_int         target_pid_t;
 #define ELF_CLASS      ELFCLASS64
 #define ELF_ARCH       EM_X86_64
 
-#include "target_coredump.c.inc"
-
 #if ULONG_MAX > UINT32_MAX
 #define INIT_GUEST_COMMPAGE
 static bool init_guest_commpage(void)
@@ -197,8 +195,6 @@ static bool init_guest_commpage(void)
 
 #define EXSTACK_DEFAULT true
 
-#include "target_coredump.c.inc"
-
 /*
  * i386 is the only target which supplies AT_SYSINFO for the vdso.
  * All others only supply AT_SYSINFO_EHDR.
@@ -229,7 +225,6 @@ static bool init_guest_commpage(void)
 #define ELF_CLASS       ELFCLASS32
 #define EXSTACK_DEFAULT true
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       4096
 
@@ -304,7 +299,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define ELF_ARCH        EM_AARCH64
 #define ELF_CLASS       ELFCLASS64
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       4096
 
@@ -376,7 +370,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
         NEW_AUX_ENT(AT_UCACHEBSIZE, 0);                 \
     } while (0)
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       4096
 
@@ -400,7 +393,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 
 #define VDSO_HEADER "vdso.c.inc"
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE        4096
 
@@ -422,7 +414,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define elf_check_abi(x) (!((x) & EF_MIPS_ABI2))
 #endif
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE        4096
 
@@ -437,7 +428,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 
 #define ELF_EXEC_PAGESIZE        4096
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #endif /* TARGET_MICROBLAZE */
 
@@ -447,7 +437,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define ELF_CLASS ELFCLASS32
 #define ELF_DATA  ELFDATA2MSB
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE 8192
 
@@ -458,7 +447,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define ELF_CLASS ELFCLASS32
 #define ELF_ARCH  EM_SH
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE        4096
 
@@ -469,7 +457,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define ELF_CLASS       ELFCLASS32
 #define ELF_ARCH        EM_68K
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       8192
 
@@ -490,7 +477,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define ELF_DATA       ELFDATA2MSB
 #define ELF_ARCH       EM_S390
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE 4096
 
@@ -562,7 +548,6 @@ static bool init_guest_commpage(void)
 #define ELF_CLASS       ELFCLASS32
 #define ELF_ARCH        EM_XTENSA
 
-#include "target_coredump.c.inc"
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       4096
 
@@ -2502,6 +2487,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct 
image_info *info)
 }
 
 #ifdef USE_ELF_CORE_DUMP
+#include "target_coredump.c.inc"
 
 /*
  * Definitions to generate Intel SVR4-like core files.
-- 
2.43.0


Reply via email to