Skip to content

Commit cb58faf

Browse files
committed
[src/ktime] fix the bug when use keil AC6 and open RT_USING_HOOKLIST and RT_USING_KTIME
1 parent c40b790 commit cb58faf

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

bsp/stm32/stm32h750-artpi/rtconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
PLATFORM = 'gcc'
2020
EXEC_PATH = r'/opt/gcc-arm-none-eabi/bin/'
2121
elif CROSS_TOOL == 'keil':
22-
PLATFORM = 'armcc'
22+
PLATFORM = 'armclang' #KEIL AC6
2323
EXEC_PATH = r'C:/Keil_v5'
2424
elif CROSS_TOOL == 'iar':
2525
PLATFORM = 'iccarm'
2626
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
2727

28-
if os.getenv('RTT_EXEC_PATH'):
28+
if os.getenv('RTT_EXEC_PATH') and (CROSS_TOOL == 'gcc'):
2929
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
3030

3131
BUILD = 'debug'

components/drivers/ktime/SConscript

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ if rtconfig.ARCH in list:
1313
else:
1414
src += Glob("src/" + rtconfig.ARCH + "/*.c")
1515
CPPPATH = [cwd, cwd + "/inc"]
16+
LOCAL_CCFLAGS = ''
17+
if rtconfig.PLATFORM in ['gcc', 'armclang']:
18+
LOCAL_CCFLAGS += ' -std=gnu99'
19+
elif rtconfig.PLATFORM in ['armcc']:
20+
LOCAL_CCFLAGS += ' --c99 --gnu'
1621

17-
group = DefineGroup('ktime', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH)
22+
group = DefineGroup('ktime', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH,LOCAL_CCFLAGS = LOCAL_CCFLAGS)
1823

1924
Return('group')

src/SConscript

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ if rtconfig.PLATFORM in ['gcc']: # only for GCC
4444
if rtconfig.ARCH not in ['sim']:
4545
LINKFLAGS += ' -Wl,--gc-sections,--print-memory-usage' # remove unused sections and print memory usage
4646

47+
if GetDepend('RT_USING_HOOKLIST') == True:
48+
if rtconfig.PLATFORM in ['gcc', 'armclang']:
49+
LOCAL_CFLAGS += ' -std=gnu99'
50+
elif rtconfig.PLATFORM in ['armcc']:
51+
LOCAL_CFLAGS += ' --c99 --gnu'
52+
4753
group = DefineGroup('Kernel', src, depend=[''], CPPPATH=inc,
4854
LINKFLAGS=LINKFLAGS, LOCAL_CFLAGS=LOCAL_CFLAGS,
4955
CPPDEFINES=['__RTTHREAD__'], LOCAL_CPPDEFINES=['__RT_KERNEL_SOURCE__'])

0 commit comments

Comments
 (0)