[incubator-nuttx] 03/07: Kconfig: Move ELF_64BIT out of !BINFMT_DISABLE

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 24c9fa3cd9f569ac4f4cd411e6272d80d2ed7d56
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Thu Mar 26 12:24:42 2020 +0900

    Kconfig: Move ELF_64BIT out of !BINFMT_DISABLE
    
    Because it's also used by LIBC_MODLIB.
---
 binfmt/Kconfig        | 7 +++++++
 binfmt/libelf/Kconfig | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/binfmt/Kconfig b/binfmt/Kconfig
index 15e878a..300a137 100644
--- a/binfmt/Kconfig
+++ b/binfmt/Kconfig
@@ -10,6 +10,13 @@ config BINFMT_DISABLE
 		By default, support for loadable binary formats is built.  This logic
 		may be suppressed be defining this setting.
 
+config ELF_64BIT
+	bool "64bit ELF support"
+	default n
+	depends on (!BINFMT_DISABLE && ELF) || LIBC_MODLIB
+	---help---
+		This option is used to load 64bit ELF files
+
 if !BINFMT_DISABLE
 
 config PATH_INITIAL
diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig
index 3d13c71..859ae66 100644
--- a/binfmt/libelf/Kconfig
+++ b/binfmt/libelf/Kconfig
@@ -3,12 +3,6 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config ELF_64BIT
-	bool "64bit ELF support"
-	default n
-	---help---
-		This option is used to load 64bit ELF files
-
 config ELF_ALIGN_LOG2
 	int "Log2 Section Alignment"
 	default 2