libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2429 from armink/del_keep 

Delete the unused '--keep' link flag when used RT_USED marco.
This commit is contained in:
Bernard Xiong 2019-03-13 08:58:27 +08:00 committed by GitHub
parent 298ddc60ee 3e4a93cc91
commit aad4e1f343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/finsh/SConscript
View File

@ -28,19 +28,12 @@ msh_file.c
''') ''')
CPPPATH = [cwd] 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'): if GetDepend('FINSH_USING_MSH'):
src = src + msh_src src = src + msh_src
if not GetDepend('FINSH_USING_MSH_ONLY'): if not GetDepend('FINSH_USING_MSH_ONLY'):
src = src + fsh_src 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') Return('group')

11
src/SConscript
View File

@ -5,15 +5,6 @@ from building import *
src = Glob('*.c') src = Glob('*.c')
CPPPATH = [RTT_ROOT + '/include'] 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: if GetDepend('RT_USING_COMPONENTS_INIT') == False:
SrcRemove(src, ['components.c']) SrcRemove(src, ['components.c'])
@ -38,6 +29,6 @@ if GetDepend('RT_USING_MEMHEAP') == False:
if GetDepend('RT_USING_DEVICE') == False: if GetDepend('RT_USING_DEVICE') == False:
SrcRemove(src, ['device.c']) SrcRemove(src, ['device.c'])
group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS) group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH)
Return('group') Return('group')