Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-07 10:03:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kconfig files, binfmt/libelf, libs/libc/machin, libs/libxx: Correct libcxx exception handling by introducing the generic config(CXX_EXCEPTION and CXX_LIBSUPCXX)

Browse Source
This commit is contained in:
Xiang Xiao
2019-01-26 11:23:31 -06:00
committed by Gregory Nutt
parent 095e28d45e
commit 38ffb98f1b
8 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
binfmt/libelf/Kconfig
View File

@@ -42,7 +42,7 @@ config ELF_DUMPBUFFER
config ELF_EXIDX_SECTNAME
string "ELF Section Name for Exception Index"
default ".ARM.exidx"
depends on UCLIBCXX_EXCEPTION
depends on CXX_EXCEPTION
---help---
Set the name string for the exception index section on the ELF modules to
be loaded by the ELF binary loader.

4
binfmt/libelf/libelf_load.c
View File

@@ -244,7 +244,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
int elf_load(FAR struct elf_loadinfo_s *loadinfo)
{
size_t heapsize;
#ifdef CONFIG_UCLIBCXX_EXCEPTION
#ifdef CONFIG_CXX_EXCEPTION
int exidx;
#endif
int ret;
@@ -330,7 +330,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
}
#endif
#ifdef CONFIG_UCLIBCXX_EXCEPTION
#ifdef CONFIG_CXX_EXCEPTION
exidx = elf_findsection(loadinfo, CONFIG_ELF_EXIDX_SECTNAME);
if (exidx < 0)
{