Merge remote-tracking branch 'upstream/master'

1 files changed, 21 insertions, 0 deletions

diff --git a/config/libc/newlib.in.2 b/config/libc/newlib.in.2
index b16b23a..48e5503 100644
--- a/config/libc/newlib.in.2
+++ b/config/libc/newlib.in.2
@@ -44,6 +44,27 @@ config LIBC_NEWLIB_ENABLE_TARGET_OPTSPACE
       
       This will compile newlib with -Os.
 
+config LIBC_NEWLIB_NANO_MALLOC
+    bool
+    prompt "Enable Nano Malloc"
+    depends on LIBC_NEWLIB_2_1_or_later
+    help
+      NEWLIB has two implementations of malloc family's functions, one in
+      `mallocr.c' and the other one in `nano-mallocr.c'.  This options
+      enables the nano-malloc implementation, which is for small systems
+      with very limited memory.  Note that this implementation does not
+      support `--enable-malloc-debugging' any more.
+
+config LIBC_NEWLIB_NANO_FORMATTED_IO
+    bool
+    prompt "Enable Nano Formatted I/O"
+    depends on LIBC_NEWLIB_2_2_or_later
+    help
+      This builds NEWLIB with a special implementation of formatted I/O
+      functions, designed to lower the size of application on small systems
+      with size constraint issues.  This option does not affect wide-char
+      formatted I/O functions.
+
 config LIBC_NEWLIB_EXTRA_CONFIG_ARRAY
     string
     prompt "Extra config for newlib"