diff options
| author | [email protected] <[email protected]> | 2011-06-19 02:47:51 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2011-06-19 02:47:51 +0000 |
| commit | 1eca19cb01309eaddbdc42cb12c17f1425124800 (patch) | |
| tree | a0276133462bf9e20ec83f2944e0cbaa10d7e824 | |
| parent | ded91b1072eedccf67e8d313dc1a0cce79de9eb3 (diff) | |
eliminate compile warning
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1524 bbd45198-f89e-11dd-88c7-29a3b14d5316
| -rw-r--r-- | components/finsh/SConscript | 6 | ||||
| -rw-r--r-- | libcpu/arm/s3c24x0/start_rvds.S | 2 | ||||
| -rw-r--r-- | src/SConscript | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/components/finsh/SConscript b/components/finsh/SConscript index 9c5bd0c37e..8eeb67df38 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -5,10 +5,10 @@ from building import * src = Glob('*.c')
CPPPATH = [RTT_ROOT + '/components/finsh']
if rtconfig.CROSS_TOOL == 'keil':
- LINKFLAGS = ' --keep __fsym_* --keep __vsym_*'
+ LINKFLAGS = ' --keep __fsym_* --keep __vsym_* '
else:
- LINKFLAGS = ''
+ LINKFLAGS = ''
-group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
+group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, LIBRARY = '')
Return('group')
diff --git a/libcpu/arm/s3c24x0/start_rvds.S b/libcpu/arm/s3c24x0/start_rvds.S index 5ca6f94022..89fca25c39 100644 --- a/libcpu/arm/s3c24x0/start_rvds.S +++ b/libcpu/arm/s3c24x0/start_rvds.S @@ -1137,7 +1137,7 @@ rt_hw_context_switch_interrupt_do PROC MRS r3, spsr ; get cpsr of interrupt thread
; switch to SVC mode and no interrupt
- MSR cpsr_c, #I_Bit|F_Bit|Mode_SVC
+ MSR cpsr_c, #I_Bit:OR:F_Bit:OR:Mode_SVC
STMFD sp!, {r2} ; push old task's pc
STMFD sp!, {r4-r12,lr}; push old task's lr,r12-r4
diff --git a/src/SConscript b/src/SConscript index 01bd929425..77018f4d2c 100644 --- a/src/SConscript +++ b/src/SConscript @@ -1,8 +1,13 @@ Import('RTT_ROOT') +Import('rtconfig') from building import * src = Glob('*.c') CPPPATH = [RTT_ROOT + '/include'] -group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH) +if rtconfig.CROSS_TOOL == 'keil' and GetDepend('RT_USING_MODULE') == True: + LINKFLAGS = ' --keep __rtmsym_* ' +else: + LINKFLAGS = '' +group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS) Return('group') |