[incubator-nuttx] branch master updated: arch/sim: Always preserve the heap memory dynamically

[jerpelea]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new be10c73  arch/sim: Always preserve the heap memory dynamically
be10c73 is described below

commit be10c734b0d072fe9ea6c755c5f8197e86fba26f
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Wed Aug 5 18:06:12 2020 +0800

    arch/sim: Always preserve the heap memory dynamically
    
    so size with nuttx could report the correct bss value:
      text    data     bss     dec     hex filename
     155467    1464    1948  158879   26c9f nuttx
    
    Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
    Change-Id: I7e9ec4d09d14b6f15b235b4b46ebdd98986d9750
---
 arch/sim/src/sim/up_allocateheap.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/sim/src/sim/up_allocateheap.c 
b/arch/sim/src/sim/up_allocateheap.c
index e9329a6..73eca44 100644
--- a/arch/sim/src/sim/up_allocateheap.c
+++ b/arch/sim/src/sim/up_allocateheap.c
@@ -73,20 +73,13 @@ void up_allocate_heap(void **heap_start, size_t *heap_size)
    * executable memory.
    */
 
-#if defined(CONFIG_LIBC_MODLIB) || defined(CONFIG_BINFMT_LOADABLE)
   /* We make the entire heap executable here to keep
    * the sim simpler. If it turns out to be a problem, the
    * ARCH_HAVE_MODULE_TEXT mechanism can be an alternative.
    */
 
   uint8_t *sim_heap = host_alloc_heap(SIM_HEAP_SIZE);
-#else
-  /* This sim_heap would be placed in BSS, which is often not
-   * executable on modern environments.
-   */
 
-  static uint8_t sim_heap[SIM_HEAP_SIZE];
-#endif
   *heap_start = sim_heap;
   *heap_size  = SIM_HEAP_SIZE;
 }