Browse Source

Merge pull request #389 from grissiom/misc-fix

Misc fix
Bernard Xiong 11 years ago
parent
commit
7241646db2
2 changed files with 5 additions and 1 deletions
  1. 4 0
      components/finsh/msh_cmd.c
  2. 1 1
      src/module.c

+ 4 - 0
components/finsh/msh_cmd.c

@@ -281,7 +281,11 @@ int cmd_free(int argc, char** argv)
 {
     extern void list_mem(void);
 
+#ifdef RT_USING_MEMHEAP_AS_HEAP
+    list_memheap();
+#else
     list_mem();
+#endif
     return 0;
 }
 FINSH_FUNCTION_EXPORT_ALIAS(cmd_free, __cmd_free, Show the memory usage in the system.);

+ 1 - 1
src/module.c

@@ -82,7 +82,7 @@ static struct rt_module_symtab *_rt_module_symtab_end   = RT_NULL;
  */
 int rt_system_module_init(void)
 {
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__CC_ARM)
     extern int __rtmsymtab_start;
     extern int __rtmsymtab_end;