modlib/gnu-elf.ld.in: fix regression with armv7a

As armv7-a addrenv layout is not in line with other archs, we need align it with others by defining ARCH_DATA_RESERVE_SIZE as same as MM_PGSIZE for now to keep gnu-elf.ld.in unified. Signed-off-by: Yanfeng Liu <[email protected]>
W-M-R · Jan 17, 2025 · 1b36954 · 1b36954
1 parent d4a0abe
commit 1b36954
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/include/nuttx/addrenv.h b/include/nuttx/addrenv.h
@@ -113,7 +113,9 @@
  */
 
 #ifdef CONFIG_BUILD_KERNEL
-#  define ARCH_DATA_RESERVE_SIZE 512
+/* use MM_PGSIZE to unify among all archs for now */
+
+#  define ARCH_DATA_RESERVE_SIZE CONFIG_MM_PGSIZE
 #else
 #  define ARCH_DATA_RESERVE_SIZE 0
 #endif

diff --git a/libs/libc/modlib/gnu-elf.ld.in b/libs/libc/modlib/gnu-elf.ld.in
@@ -26,7 +26,8 @@
 #  include <nuttx/addrenv.h>
 
 #  define TEXT CONFIG_ARCH_TEXT_VBASE
-#  define DATA CONFIG_ARCH_DATA_VBASE + CONFIG_MM_PGSIZE
+#  define DATA CONFIG_ARCH_DATA_VBASE + ARCH_DATA_RESERVE_SIZE
+
 #else
 #  define TEXT 0x0
 #  define DATA