summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrissiom <[email protected]>2015-04-14 18:22:46 +0800
committerardafu <[email protected]>2015-04-15 16:13:29 +0800
commit81d7ef1e9f0de1996eb582f688120344b615f4e1 (patch)
tree3a15f23e6f50a4ba746e7fd1876d55bbd4da112e
parent39452b67b0351ac7b0b941971c4fe3be8f76d57e (diff)
SConscript: fix the `--keep` parameter for Keil
The old `--keep` parameter for Keil is wrong. RTFM of Keil and get it right.
-rw-r--r--components/finsh/SConscript4
-rw-r--r--src/SConscript4
2 files changed, 4 insertions, 4 deletions
diff --git a/components/finsh/SConscript b/components/finsh/SConscript
index edb52eb357..8d6729e4a7 100644
--- a/components/finsh/SConscript
+++ b/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 = ''
diff --git a/src/SConscript b/src/SConscript
index 6d59365195..0242d4634c 100644
--- a/src/SConscript
+++ b/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 = ''