Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch: Select 64bit elf base on the architecture characteristic

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I09eec5a76f255016a910cfec3b3f70cd7577525e
This commit is contained in:
Xiang Xiao
2020-06-01 02:41:11 +08:00
committed by Brennan Ashton
parent f6a87c5c15
commit b932b653dd
10 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/Kconfig
+1
View File
@@ -84,6 +84,7 @@ config ARCH_X86
config ARCH_X86_64 config ARCH_X86_64
bool "x86_64" bool "x86_64"
select LIBC_ARCH_ELF_64BIT if LIBC_ARCH_ELF
---help--- ---help---
x86-64 architectures. x86-64 architectures.
arch/risc-v/Kconfig
+1
View File
@@ -58,6 +58,7 @@ config ARCH_RV32IM
config ARCH_RV64GC config ARCH_RV64GC
bool bool
default n default n
select LIBC_ARCH_ELF_64BIT if LIBC_ARCH_ELF
config ARCH_FAMILY config ARCH_FAMILY
string string
arch/sim/Kconfig
+1
View File
@@ -13,6 +13,7 @@ choice
config HOST_X86_64 config HOST_X86_64
bool "x86_64" bool "x86_64"
select ARCH_HAVE_STACKCHECK select ARCH_HAVE_STACKCHECK
select LIBC_ARCH_ELF_64BIT if LIBC_ARCH_ELF && !SIM_M32
config HOST_X86 config HOST_X86
bool "x86" bool "x86"
binfmt/Kconfig
-7
View File
@@ -10,13 +10,6 @@ config BINFMT_DISABLE
By default, support for loadable binary formats is built. This logic By default, support for loadable binary formats is built. This logic
may be suppressed be defining this setting. 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 if !BINFMT_DISABLE
config PATH_INITIAL config PATH_INITIAL
boards/risc-v/k210/maix-bit/configs/elf/defconfig
-1
View File
@@ -21,7 +21,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
CONFIG_ELF=y CONFIG_ELF=y
CONFIG_ELF_64BIT=y
CONFIG_ELF_ALIGN_LOG2=3 CONFIG_ELF_ALIGN_LOG2=3
CONFIG_EXAMPLES_ELF=y CONFIG_EXAMPLES_ELF=y
CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS=y
boards/risc-v/k210/maix-bit/configs/module/defconfig
-1
View File
@@ -21,7 +21,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
CONFIG_ELF=y CONFIG_ELF=y
CONFIG_ELF_64BIT=y
CONFIG_ELF_ALIGN_LOG2=3 CONFIG_ELF_ALIGN_LOG2=3
CONFIG_EXAMPLES_MODULE=y CONFIG_EXAMPLES_MODULE=y
CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS=y
boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig
-1
View File
@@ -21,7 +21,6 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
CONFIG_ELF=y CONFIG_ELF=y
CONFIG_ELF_64BIT=y
CONFIG_EXAMPLES_POSIXSPAWN=y CONFIG_EXAMPLES_POSIXSPAWN=y
CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y CONFIG_FS_ROMFS=y
boards/sim/sim/sim/configs/module/defconfig
-1
View File
@@ -19,7 +19,6 @@ CONFIG_BUILTIN=y
CONFIG_CLOCK_MONOTONIC=y CONFIG_CLOCK_MONOTONIC=y
CONFIG_DEV_LOOP=y CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y CONFIG_DEV_ZERO=y
CONFIG_ELF_64BIT=y
CONFIG_EXAMPLES_MODULE=y CONFIG_EXAMPLES_MODULE=y
CONFIG_EXAMPLES_MODULE_DEVMINOR=4 CONFIG_EXAMPLES_MODULE_DEVMINOR=4
CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram4" CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram4"
include/elf.h
+1 -1
View File
@@ -33,7 +33,7 @@
/* NOTE: elf64.h and elf32.h refer EI_NIDENT defined above */ /* NOTE: elf64.h and elf32.h refer EI_NIDENT defined above */
#ifdef CONFIG_ELF_64BIT #ifdef CONFIG_LIBC_ARCH_ELF_64BIT
# include <elf64.h> # include <elf64.h>
#else #else
# include <elf32.h> # include <elf32.h>
libs/libc/machine/Kconfig
+5
View File
@@ -88,6 +88,11 @@ config LIBC_ARCH_ELF
bool bool
default n default n
config LIBC_ARCH_ELF_64BIT
bool
default n
depends on LIBC_ARCH_ELF
config LIBM_ARCH_CEIL config LIBM_ARCH_CEIL
bool bool
default n default n