Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Change CONFIG_ADDRENV to CONFIG_ARCH_ADDRENV; change how it is selected -- the architecure must first declare support

Browse Source
This commit is contained in:
Gregory Nutt
2014-08-24 06:42:11 -06:00
parent 29a40668eb
commit 1624e2fbcf
269 changed files with 340 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binfmt/libelf/libelf_load.c
+3 -3
View File
@@ -165,12 +165,12 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
if (shdr->sh_type != SHT_NOBITS)
{
/* If CONFIG_ADDRENV=y, then 'dest' lies in a virtual address space
/* If CONFIG_ARCH_ADDRENV=y, then 'dest' lies in a virtual address space
* that may not be in place now. elf_addrenv_select() will
* temporarily instantiate that address space.
*/
#ifdef CONFIG_ADDRENV
#ifdef CONFIG_ARCH_ADDRENV
ret = elf_addrenv_select(loadinfo);
if (ret < 0)
{
@@ -190,7 +190,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
/* Restore the original address environment */
#ifdef CONFIG_ADDRENV
#ifdef CONFIG_ARCH_ADDRENV
ret = elf_addrenv_restore(loadinfo);
if (ret < 0)
{