ソースを参照

Merge pull request #2429 from armink/del_keep

Delete the unused '--keep' link flag when used RT_USED marco.
Bernard Xiong 6 年 前
コミット
aad4e1f343
2 ファイル変更2 行追加18 行削除
  1. 1 8
      components/finsh/SConscript
  2. 1 10
      src/SConscript

+ 1 - 8
components/finsh/SConscript

@@ -28,19 +28,12 @@ msh_file.c
 ''')
 
 CPPPATH = [cwd]
-if rtconfig.CROSS_TOOL == 'keil':
-    LINKFLAGS = ' --keep *.o(FSymTab)'
-
-    if not GetDepend('FINSH_USING_MSH_ONLY'):
-        LINKFLAGS = LINKFLAGS + ' --keep *.o(VSymTab) '
-else:
-    LINKFLAGS = '' 
 
 if GetDepend('FINSH_USING_MSH'):
 	src = src + msh_src
 if not GetDepend('FINSH_USING_MSH_ONLY'):
     src = src + fsh_src
 
-group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
+group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
 
 Return('group')

+ 1 - 10
src/SConscript

@@ -5,15 +5,6 @@ from building import *
 src = Glob('*.c')
 
 CPPPATH = [RTT_ROOT + '/include']
-if rtconfig.CROSS_TOOL == 'keil':
-    # add more link flags for module and components_init.
-    LINKFLAGS = ''
-    if GetDepend('RT_USING_MODULE'):
-        LINKFLAGS += ' --keep *.o(RTMSymTab) '
-    if GetDepend('RT_USING_COMPONENTS_INIT'):
-        LINKFLAGS += ' --keep *.o(.rti_fn.*) '
-else:
-    LINKFLAGS = ''
 
 if GetDepend('RT_USING_COMPONENTS_INIT') == False:
     SrcRemove(src, ['components.c'])
@@ -38,6 +29,6 @@ if GetDepend('RT_USING_MEMHEAP') == False:
 if GetDepend('RT_USING_DEVICE') == False:
     SrcRemove(src, ['device.c'])
 
-group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
+group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')