浏览代码

SConscript: fix the `--keep` parameter for Keil

The old `--keep` parameter for Keil is wrong. RTFM of Keil and get it
right.
Grissiom 10 年之前
父节点
当前提交
81d7ef1e9f
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      components/finsh/SConscript
  2. 2 2
      src/SConscript

+ 2 - 2
components/finsh/SConscript

@@ -28,10 +28,10 @@ msh.c
 
 CPPPATH = [cwd]
 if rtconfig.CROSS_TOOL == 'keil':
-    LINKFLAGS = ' --keep __fsym_*'
+    LINKFLAGS = ' --keep *.o(FSymTab)'
 
     if not GetDepend('FINSH_USING_MSH_ONLY'):
-        LINKFLAGS = LINKFLAGS + ' --keep __vsym_* '
+        LINKFLAGS = LINKFLAGS + ' --keep *.o(VSymTab) '
 else:
     LINKFLAGS = '' 
 

+ 2 - 2
src/SConscript

@@ -9,9 +9,9 @@ if rtconfig.CROSS_TOOL == 'keil':
     # add more link flags for module and components_init.
     LINKFLAGS = ''
     if GetDepend('RT_USING_MODULE'):
-        LINKFLAGS = ' --keep __rtmsym_* '
+        LINKFLAGS = ' --keep *.o(RTMSymTab) '
     if GetDepend('RT_USING_COMPONENTS_INIT'):
-        LINKFLAGS = ' --keep __rt_init* '
+        LINKFLAGS = ' --keep *.o(.rti_fn.*) '
 else:
     LINKFLAGS = ''