remove minilibc

Author: mysterywolf

bsp/efm32/copy_this_file_shell.c

@@ -32,14 +32,6 @@ ALIGN(RT_ALIGN_SIZE)
 static char finsh_thread_stack[FINSH_THREAD_STACK_SIZE];
 struct finsh_shell* shell;
 
-#if !defined (RT_USING_NEWLIB) && !defined (RT_USING_MINILIBC)
-int strcmp (const char *s1, const char *s2)
-{
-	while (*s1 && *s1 == *s2) s1++, s2++;
-
-	return (*s1 - *s2);
-}
-
 #ifdef RT_USING_HEAP
 char *strdup(const char *s)
 {

bsp/lpc2148/rtconfig.h

@@ -80,10 +80,6 @@
 /* Using QEMU or SkyEye*/
 /* #define RT_USING_EMULATOR */
 
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
 /* SECTION: C++ support */
 /* Using C++ support*/
 /* #define RT_USING_CPLUSPLUS */

bsp/microblaze/rtconfig.h

@@ -93,7 +93,6 @@
 /* SECTION: a runtime libc library */
 /* a runtime libc library*/
 /* #define RT_USING_NEWLIB */
-#define RT_USING_MINILIBC
 
 /* SECTION: C++ support */
 /* Using C++ support*/

bsp/sam7x/rtconfig.h

@@ -72,10 +72,6 @@
 #define FINSH_USING_SYMTAB
 #define FINSH_USING_DESCRIPTION
 
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
 /* SECTION: C++ support */
 /* Using C++ support*/
 /* #define RT_USING_CPLUSPLUS */

bsp/wh44b0/rtconfig.h

@@ -65,10 +65,6 @@
 /* Using FinSH as Shell*/
 /* #define RT_USING_FINSH */
 
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
 /* SECTION: C++ support */
 /* Using C++ support*/
 /* #define RT_USING_CPLUSPLUS */

components/dfs/filesystems/nfs/rpc/types.h

@@ -47,30 +47,14 @@
 
 #include <string.h>
 #include <stdint.h>
-
-#ifndef RT_USING_MINILIBC
-typedef unsigned int u_int;
-typedef unsigned char u_char;
-typedef unsigned long u_long;
-#else
 #include <sys/types.h>
-#include <stdint.h>
-#endif
 
 typedef long long   int64_t;
 typedef unsigned long long uint64_t;
 
 typedef int bool_t;
 typedef int enum_t;
 
-#ifndef RT_USING_NEWLIB
-typedef unsigned long dev_t;
-#endif
-
-#if !defined(RT_USING_NEWLIB) && !defined(RT_USING_MINILIBC)
-typedef rt_int32_t  ssize_t;
-#endif
-
 /* This needs to be changed to uint32_t in the future */
 typedef unsigned long rpcprog_t;
 typedef unsigned long rpcvers_t;

components/libc/compilers/armlibc/sys/types.h

@@ -23,4 +23,10 @@ typedef long signed int  ssize_t;       /* Used for a count of bytes or an error
 #endif
 typedef unsigned long    useconds_t;    /* microseconds (unsigned) */
 
+typedef unsigned long    dev_t;
+
+typedef unsigned int     u_int;
+typedef unsigned char    u_char;
+typedef unsigned long    u_long;
+
 #endif

components/libc/compilers/common/SConscript

@@ -10,7 +10,7 @@ CPPPATH = [cwd]
 if GetDepend('RT_USING_LIBC'):
     src += Glob('*.c')
 else:
-    if GetDepend('RT_LIBC_USING_TIME') and not GetDepend('RT_USING_MINILIBC'):
+    if GetDepend('RT_LIBC_USING_TIME'):
         src += ['time.c']
 
 if GetDepend('RT_USING_POSIX') == False:
@@ -21,7 +21,7 @@ if rtconfig.CROSS_TOOL == 'keil':
 else:
     CPPDEFINES = []
 
-if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')):
+if GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME'):
     group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')

components/libc/compilers/dlib/sys/types.h

@@ -22,4 +22,10 @@ typedef long signed int  ssize_t;       /* Used for a count of bytes or an error
 #endif
 typedef unsigned long    useconds_t;    /* microseconds (unsigned) */
 
+typedef unsigned long    dev_t;
+
+typedef unsigned int     u_int;
+typedef unsigned char    u_char;
+typedef unsigned long    u_long;
+
 #endif

components/libc/compilers/newlib/SConscript

@@ -1,21 +1,30 @@
 from building import *
 Import('rtconfig')
 
-src = Glob('*.c')
+src = []
 cwd = GetCurrentDir()
 group = []
 
 CPPPATH = [cwd]
-CPPDEFINES = ['RT_USING_NEWLIB']
-
-# link with libc and libm:
-# libm is a frequently used lib. Newlib is compiled with -ffunction-sections in
-# recent GCC tool chains. The linker would just link in the functions that have
-# been referenced. So setting this won't result in bigger text size.
-LIBS = ['c', 'm']
 
 if rtconfig.PLATFORM == 'gcc':
-    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
-        CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
+    if GetDepend('RT_USING_LIBC'):
+        CPPDEFINES = ['RT_USING_NEWLIB']
+        # link with libc and libm:
+        # libm is a frequently used lib. Newlib is compiled with -ffunction-sections in
+        # recent GCC tool chains. The linker would just link in the functions that have
+        # been referenced. So setting this won't result in bigger text size.
+        LIBS = ['c', 'm']
+
+        src += Glob('*.c')
+        SrcRemove(src, ['minilib.c'])
+        if GetDepend('RT_USING_MODULE') == False:
+            SrcRemove(src, ['libc_syms.c'])
+    else:
+        src += ['minilib.c']
+        CPPDEFINES = []
+        LIBS = []
+
+    group = DefineGroup('libc', src, depend = [], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
 
 Return('group')