Skip to content

Commit aad4e1f

Browse files
authored
Merge pull request #2429 from armink/del_keep
Delete the unused '--keep' link flag when used RT_USED marco.
2 parents 298ddc6 + 3e4a93c commit aad4e1f

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

components/finsh/SConscript

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,12 @@ msh_file.c
2828
''')
2929

3030
CPPPATH = [cwd]
31-
if rtconfig.CROSS_TOOL == 'keil':
32-
LINKFLAGS = ' --keep *.o(FSymTab)'
33-
34-
if not GetDepend('FINSH_USING_MSH_ONLY'):
35-
LINKFLAGS = LINKFLAGS + ' --keep *.o(VSymTab) '
36-
else:
37-
LINKFLAGS = ''
3831

3932
if GetDepend('FINSH_USING_MSH'):
4033
src = src + msh_src
4134
if not GetDepend('FINSH_USING_MSH_ONLY'):
4235
src = src + fsh_src
4336

44-
group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
37+
group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
4538

4639
Return('group')

src/SConscript

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ from building import *
55
src = Glob('*.c')
66

77
CPPPATH = [RTT_ROOT + '/include']
8-
if rtconfig.CROSS_TOOL == 'keil':
9-
# add more link flags for module and components_init.
10-
LINKFLAGS = ''
11-
if GetDepend('RT_USING_MODULE'):
12-
LINKFLAGS += ' --keep *.o(RTMSymTab) '
13-
if GetDepend('RT_USING_COMPONENTS_INIT'):
14-
LINKFLAGS += ' --keep *.o(.rti_fn.*) '
15-
else:
16-
LINKFLAGS = ''
178

189
if GetDepend('RT_USING_COMPONENTS_INIT') == False:
1910
SrcRemove(src, ['components.c'])
@@ -38,6 +29,6 @@ if GetDepend('RT_USING_MEMHEAP') == False:
3829
if GetDepend('RT_USING_DEVICE') == False:
3930
SrcRemove(src, ['device.c'])
4031

41-
group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
32+
group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH)
4233

4334
Return('group')

0 commit comments

Comments
 (0)