summaryrefslogtreecommitdiff
path: root/nuttx/binfmt
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-14 10:21:18 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-14 10:21:18 -0600
commit7501579ff7683ee50d4fed4727e081c2e2535342 (patch)
treefbbe14a7474ae7549deab0ee139d3cb3fb2a65ee /nuttx/binfmt
parent0722a39b7423738eb2f49218c51036eb93b70016 (diff)
downloadnuttx-7501579ff7683ee50d4fed4727e081c2e2535342.tar.gz
nuttx-7501579ff7683ee50d4fed4727e081c2e2535342.tar.bz2
nuttx-7501579ff7683ee50d4fed4727e081c2e2535342.zip
Add description of work queues to the porting guide. Update comments
Diffstat (limited to 'nuttx/binfmt')
-rw-r--r--nuttx/binfmt/libelf/libelf_load.c5
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_addrenv.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/nuttx/binfmt/libelf/libelf_load.c b/nuttx/binfmt/libelf/libelf_load.c
index 95d46999a..385d3355f 100644
--- a/nuttx/binfmt/libelf/libelf_load.c
+++ b/nuttx/binfmt/libelf/libelf_load.c
@@ -264,7 +264,10 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
elf_elfsize(loadinfo);
/* Determine the heapsize to allocate. heapsize is ignored if there is
- * no address environment.
+ * no address environment because the heap is a shared resource in that
+ * case. If there is no dynamic stack then heapsize must at least as big
+ * as the fixed stack size since the stack will be allocated from the heap
+ * in that case.
*/
#if !defined(CONFIG_ARCH_ADDRENV)
diff --git a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c
index c7e82f537..371a93404 100644
--- a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c
+++ b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c
@@ -108,7 +108,10 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
}
#ifdef CONFIG_ARCH_ADDRENV
- /* Determine the heapsize to allocate */
+ /* Determine the heapsize to allocate. If there is no dynamic stack then
+ * heapsize must at least as big as the fixed stack size since the stack
+ * will be allocated from the heap in that case.
+ */
#ifdef CONFIG_ARCH_STACK_DYNAMIC
heapsize = ARCH_HEAP_SIZE;