binfmt: Always include arch/elf.h in include/nuttx/elf.h
since symbols defined in arch/elf.h is also used in other case, for example:
CC: pthread/pthread_testcancel.c machine/arm/gnu_unwind_find_exidx.c:32:8: error: unknown type name '__EIT_entry'
32 | static __EIT_entry *__exidx_start_elf;
| ^~~~~~~~~~~
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
diff --git a/arch/arm/src/common/arm_backtrace_unwind.c b/arch/arm/src/common/arm_backtrace_unwind.c
index 5fc33ff..a6d9a1a 100644
--- a/arch/arm/src/common/arm_backtrace_unwind.c
+++ b/arch/arm/src/common/arm_backtrace_unwind.c
@@ -23,9 +23,9 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/arch.h>
-#include <arch/elf.h>
+#include <nuttx/arch.h>
+#include <nuttx/elf.h>
#include "sched/sched.h"
#include "arm_internal.h"
diff --git a/include/nuttx/elf.h b/include/nuttx/elf.h
index b9c2588..c0f8d9f 100644
--- a/include/nuttx/elf.h
+++ b/include/nuttx/elf.h
@@ -26,9 +26,7 @@
****************************************************************************/
#include <elf.h>
-#ifdef CONFIG_ELF_COREDUMP
#include <arch/elf.h>
-#endif
/****************************************************************************
* Pre-processor Definitions
diff --git a/libs/libc/machine/arm/arm/arch_elf.c b/libs/libc/machine/arm/arm/arch_elf.c
index 9fb385a..a3c94a3 100644
--- a/libs/libc/machine/arm/arm/arch_elf.c
+++ b/libs/libc/machine/arm/arm/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/arm/armv6-m/arch_elf.c b/libs/libc/machine/arm/armv6-m/arch_elf.c
index 60001cb..0972646 100644
--- a/libs/libc/machine/arm/armv6-m/arch_elf.c
+++ b/libs/libc/machine/arm/armv6-m/arch_elf.c
@@ -28,7 +28,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/arm/armv7-a/arch_elf.c b/libs/libc/machine/arm/armv7-a/arch_elf.c
index 1ecacf3..6d5f270 100644
--- a/libs/libc/machine/arm/armv7-a/arch_elf.c
+++ b/libs/libc/machine/arm/armv7-a/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/arm/armv7-m/arch_elf.c b/libs/libc/machine/arm/armv7-m/arch_elf.c
index c2e6c27..2bfc8f2 100644
--- a/libs/libc/machine/arm/armv7-m/arch_elf.c
+++ b/libs/libc/machine/arm/armv7-m/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/arm/armv7-r/arch_elf.c b/libs/libc/machine/arm/armv7-r/arch_elf.c
index 8726637..7b11444 100644
--- a/libs/libc/machine/arm/armv7-r/arch_elf.c
+++ b/libs/libc/machine/arm/armv7-r/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/arm/armv8-m/arch_elf.c b/libs/libc/machine/arm/armv8-m/arch_elf.c
index d63e5ed..2b146a2 100644
--- a/libs/libc/machine/arm/armv8-m/arch_elf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/risc-v/arch_elf.c b/libs/libc/machine/risc-v/arch_elf.c
index 9efa483..ef7324e 100644
--- a/libs/libc/machine/risc-v/arch_elf.c
+++ b/libs/libc/machine/risc-v/arch_elf.c
@@ -30,7 +30,6 @@
#include <debug.h>
#include <assert.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/sparc/arch_elf.c b/libs/libc/machine/sparc/arch_elf.c
index 7777c72..fb19702 100644
--- a/libs/libc/machine/sparc/arch_elf.c
+++ b/libs/libc/machine/sparc/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
diff --git a/libs/libc/machine/xtensa/arch_elf.c b/libs/libc/machine/xtensa/arch_elf.c
index 56eded4..45168ba 100644
--- a/libs/libc/machine/xtensa/arch_elf.c
+++ b/libs/libc/machine/xtensa/arch_elf.c
@@ -29,7 +29,6 @@
#include <errno.h>
#include <debug.h>
-#include <arch/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
