From 5c2b75cc622dd8e07fc2266fe9732d67d9977fba Mon Sep 17 00:00:00 2001
From: "bernard.xiong" <bernard.xiong@gmail.com>
Date: Mon, 26 Apr 2010 10:32:33 +0000
Subject: [PATCH] fix minilibc compiling issue.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@671 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/mini2440/application.c |  2 +-
 bsp/mini2440/rtconfig.h    |  2 --
 bsp/mini2440/rtconfig.py   | 12 ++++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bsp/mini2440/application.c b/bsp/mini2440/application.c
index 73c8eec4e7..5d591867ec 100644
--- a/bsp/mini2440/application.c
+++ b/bsp/mini2440/application.c
@@ -48,7 +48,7 @@ void rt_init_thread_entry(void* parameter)
 		/* init the device filesystem */
 		dfs_init();
 
-#ifdef defined(RT_USING_DFS_ELMFAT)
+#if defined(RT_USING_DFS_ELMFAT)
 		/* init the elm chan FatFs filesystam*/
 		elm_init();
 
diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h
index 6b4d244ad3..4014011de8 100644
--- a/bsp/mini2440/rtconfig.h
+++ b/bsp/mini2440/rtconfig.h
@@ -81,8 +81,6 @@
 /* a runtime libc library */
 /* #define RT_USING_NEWLIB */
 
-/* SECTION: a mini libc */
-
 /* SECTION: C++ support */
 /* Using C++ support */
 /* #define RT_USING_CPLUSPLUS */
diff --git a/bsp/mini2440/rtconfig.py b/bsp/mini2440/rtconfig.py
index 9e2ae60fd1..8e104f86dc 100644
--- a/bsp/mini2440/rtconfig.py
+++ b/bsp/mini2440/rtconfig.py
@@ -20,9 +20,13 @@ f.close()
 PreProcessor.process_contents(contents)
 rtconfig_ns = PreProcessor.cpp_namespace
 
+# libc options
+if rtconfig_ns.has_key('RT_USING_NEWLIB'):
+    RT_USING_NEWLIB = True
+
 # finsh shell options
 if rtconfig_ns.has_key('RT_USING_FINSH'):
-	RT_USING_FINSH = True
+    RT_USING_FINSH = True
 
 # device virtual filesystem options
 if rtconfig_ns.has_key('RT_USING_DFS'):
@@ -77,9 +81,9 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
 
     DEVICE = ' -mcpu=arm920t'
-    CFLAGS = DEVICE + ' -DRT_USING_MINILIBC' + ' -nostdinc -nostdlib -fno-builtin'
+    CFLAGS = DEVICE
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp' + ' -DTEXT_BASE=' + TextBase
-    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=main.elf.map,-cref,-u,_start -T mini2440_ram.ld' + ' -Ttext ' + TextBase
+    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread_mini2440.map,-cref,-u,_start -T mini2440_ram.ld' + ' -Ttext ' + TextBase
 
     CPATH = ''
     LPATH = ''
@@ -92,7 +96,7 @@ if PLATFORM == 'gcc':
 
     if RT_USING_WEBSERVER:
         CFLAGS += ' -DWEBS -DUEMF -DRTT -D__NO_FCNTL=1 -DRT_USING_WEBSERVER'
-    RT_USING_MINILIBC = True
+
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
-- 
GitLab