Merge pull request #192 from sifive/support-max-heap-option

Fix maximal-heap size cause relocation error
sifive · Nov 4, 2019 · 9ed8270 · 9ed8270
2 parents 09a8464 + 205bbfa
commit 9ed8270
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/linker_script/sections/uninit_group.c++ b/linker_script/sections/uninit_group.c++
@@ -52,9 +52,10 @@ UninitGroup::UninitGroup(const fdt &dtb, Memory logical_memory,
   heap.output_name = "heap";
 
   heap.add_command("PROVIDE( metal_segment_heap_target_start = . );");
-  heap.add_command(". = DEFINED(__heap_max) ? LENGTH(" + virtual_memory.name +
-                   ") - ( . - ORIGIN(" + virtual_memory.name +
-                   ") "
+  heap.add_command(". = DEFINED(__heap_max) ? MIN( LENGTH(" +
+                   virtual_memory.name + ") - ( . - ORIGIN(" +
+                   virtual_memory.name +
+                   ")) , 0x10000000"
                    ") : __heap_size;");
   heap.add_command("PROVIDE( metal_segment_heap_target_end = . );");
   heap.add_command("PROVIDE( _heap_end = . );");