[Scons][iar][iccarm] IAR统一使用iccarm作为判断条件而不是是用IDE的名字来进行判断

因为不确定后续IAR是否会像Keil一样内含有不同的编译工具链此外，将判断条件改为列表方式，这样更方便后续增加其他可能的IAR编译链
2026-02-07 01:44:41 +08:00 · 2022-05-30 18:11:15 -04:00
parent 50f041f5c2
commit 83b3aadaa3
392 changed files with 396 additions and 396 deletions
--- a/bsp/CME_M7/CMSIS/SConscript
+++ b/bsp/CME_M7/CMSIS/SConscript
@@ -15,7 +15,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += ['CME_M7/startup/gcc/startup_CME_M7.c']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += ['CME_M7/startup/arm/startup_cmem7.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    print('================ERROR============================')
    print('Not support IAR yet!')
    print('=================================================')
--- a/bsp/CME_M7/SConstruct
+++ b/bsp/CME_M7/SConstruct
@@ -16,7 +16,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
 	env.Replace(ARFLAGS = [''])
 	env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
--- a/bsp/Vango/v85xx/SConstruct
+++ b/bsp/Vango/v85xx/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/Vango/v85xxp/SConstruct
+++ b/bsp/Vango/v85xxp/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/acm32/acm32f0x0-nucleo/SConstruct
+++ b/bsp/acm32/acm32f0x0-nucleo/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
--- a/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript
+++ b/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript
@@ -29,7 +29,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src = src + ['Device/Startup_ACM32F0x0_gcc.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src = src + ['Device/Startup_ACM32F0x0.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src = src + ['Device/Startup_ACM32F0x0_iar.s']

 path = [cwd + '/HAL_Driver/Inc',
--- a/bsp/acm32/acm32f4xx-nucleo/SConstruct
+++ b/bsp/acm32/acm32f4xx-nucleo/SConstruct
@@ -19,7 +19,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
 	env.Replace(ARFLAGS = [''])
 	env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
--- a/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript
+++ b/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript
@@ -22,7 +22,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += ['Device/Startup_ACM32F4_gcc.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += ['Device/Startup_ACM32F4.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += ['Device/Startup_ACM32F4_iar.s']

 path = [cwd + '/HAL_Driver/Inc',
--- a/bsp/airm2m/air105/SConstruct
+++ b/bsp/airm2m/air105/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
--- a/bsp/airm2m/air105/board/SConscript
+++ b/bsp/airm2m/air105/board/SConscript
@@ -28,7 +28,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/HAL_Driver/Startup/gcc/startup_gcc.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/HAL_Driver/Startup/arm/startup_gcc.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/HAL_Driver/Startup/iar/startup_gcc.s']

 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
--- a/bsp/amebaz/SConstruct
+++ b/bsp/amebaz/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/amebaz/libraries/smartconfig/SConscript
+++ b/bsp/amebaz/libraries/smartconfig/SConscript
@@ -9,7 +9,7 @@ libpath = [cwd + '/libs']

 if rtconfig.PLATFORM in ['gcc']:
    libs += ['libsmartconfig_armcm4_gcc']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    libs += ['libsmartconfig_armcm4_iar']

 group = DefineGroup('Libraries', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath)
--- a/bsp/apm32/apm32f103xe-minibroard/SConstruct
+++ b/bsp/apm32/apm32f103xe-minibroard/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
--- a/bsp/apm32/apm32f103xe-minibroard/board/SConscript
+++ b/bsp/apm32/apm32f103xe-minibroard/board/SConscript
@@ -18,7 +18,7 @@ startup_path_prefix = SDK_LIB
 if rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/arm/startup_apm32f10x_hd.s']

-if rtconfig.CROSS_TOOL == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/iar/startup_apm32f10x_hd.s']

 if rtconfig.PLATFORM in ['gcc']:
--- a/bsp/apollo2/SConstruct
+++ b/bsp/apollo2/SConstruct
@@ -20,7 +20,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
 	env.Replace(ARFLAGS = [''])
 	env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
--- a/bsp/apollo2/libraries/startup/SConscript
+++ b/bsp/apollo2/libraries/startup/SConscript
@@ -14,7 +14,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src = src + ['gcc/' + 'startup_gcc.c']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src = src + ['arm/' + 'startup_keil.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src = src + ['iar/' + 'startup_iar.c']

 path = [cwd]
--- a/bsp/at32/at32f403a-start/SConstruct
+++ b/bsp/at32/at32f403a-start/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/at32/at32f403a-start/board/SConscript
+++ b/bsp/at32/at32f403a-start/board/SConscript
@@ -21,7 +21,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f403a_407.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f403a_407.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f403a_407.s']
    
 CPPDEFINES = ['AT32F403AVGT7']
--- a/bsp/at32/at32f407-start/SConstruct
+++ b/bsp/at32/at32f407-start/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/at32/at32f407-start/board/SConscript
+++ b/bsp/at32/at32f407-start/board/SConscript
@@ -21,7 +21,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f403a_407.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f403a_407.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f403a_407.s']
    
 CPPDEFINES = ['AT32F407VGT7']
--- a/bsp/at32/at32f413-start/SConstruct
+++ b/bsp/at32/at32f413-start/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/at32/at32f413-start/board/SConscript
+++ b/bsp/at32/at32f413-start/board/SConscript
@@ -21,7 +21,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
    src += [startup_path_prefix + '/AT32F413_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f413.s']
 elif rtconfig.CROSS_TOOL == 'keil':
    src += [startup_path_prefix + '/AT32F413_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f413.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/AT32F413_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f413.s']
    
 CPPDEFINES = ['AT32F413RCT7']
--- a/bsp/at32/at32f415-start/SConstruct
+++ b/bsp/at32/at32f415-start/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/at32/at32f415-start/board/SConscript
+++ b/bsp/at32/at32f415-start/board/SConscript
@@ -21,7 +21,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
    src += [startup_path_prefix + '/AT32F415_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f415.s']
 elif rtconfig.CROSS_TOOL == 'keil':
    src += [startup_path_prefix + '/AT32F415_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f415.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/AT32F415_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f415.s']
    
 CPPDEFINES = ['AT32F415RCT7']
--- a/bsp/at32/at32f435-start/SConstruct
+++ b/bsp/at32/at32f435-start/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/at32/at32f435-start/board/SConscript
+++ b/bsp/at32/at32f435-start/board/SConscript
@@ -21,7 +21,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f435_437.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f435_437.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f435_437.s']
    
 CPPDEFINES = ['AT32F435ZMT7']
--- a/bsp/at32/at32f437-start/SConstruct
+++ b/bsp/at32/at32f437-start/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/at32/at32f437-start/board/SConscript
+++ b/bsp/at32/at32f437-start/board/SConscript
@@ -21,7 +21,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f435_437.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f435_437.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f435_437.s']
    
 CPPDEFINES = ['AT32F437ZMT7']
--- a/bsp/at91/at91sam9260/platform/SConscript
+++ b/bsp/at91/at91sam9260/platform/SConscript
@@ -12,7 +12,7 @@ if rtconfig.PLATFORM in ['armcc', 'armclang']:
 if rtconfig.PLATFORM in ['gcc']:
 	src = Glob('*.c') + Glob('*_gcc.S') + Glob('*_init.S')

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	src = Glob('*.c') + Glob('*_iar.S')

 if rtconfig.PLATFORM == 'cl':
--- a/bsp/at91/at91sam9g45/platform/SConscript
+++ b/bsp/at91/at91sam9g45/platform/SConscript
@@ -12,7 +12,7 @@ if rtconfig.PLATFORM in ['armcc', 'armclang']:
 if rtconfig.PLATFORM in ['gcc']:
 	src = Glob('*.c') + Glob('*_gcc.S') + Glob('*_init.S')

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	src = Glob('*.c') + Glob('*_iar.S')

 if rtconfig.PLATFORM == 'cl':
--- a/bsp/bluetrum/libcpu/cpu/SConscript
+++ b/bsp/bluetrum/libcpu/cpu/SConscript
@@ -15,7 +15,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += Glob('*_init.S')
    src += Glob('*_gcc.S')

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    src += Glob('*_iar.S')

 group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
--- a/bsp/essemi/es32f0654/SConstruct
+++ b/bsp/essemi/es32f0654/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/essemi/es32f0654/libraries/SConscript
+++ b/bsp/essemi/es32f0654/libraries/SConscript
@@ -15,7 +15,7 @@ if rtconfig.PLATFORM in ['gcc']:
     src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/gcc/startup_es32f065x.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/keil/startup_es32f065x.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/iar/startup_es32f065x.s']

 path = [cwd + '/CMSIS/Device/EastSoft/ES32F065x/Include',
--- a/bsp/essemi/es32f365x/SConstruct
+++ b/bsp/essemi/es32f365x/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/essemi/es32f369x/SConstruct
+++ b/bsp/essemi/es32f369x/SConstruct
@@ -25,7 +25,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/essemi/es32f369x/libraries/SConscript
+++ b/bsp/essemi/es32f369x/libraries/SConscript
@@ -15,7 +15,7 @@ if rtconfig.PLATFORM in ['gcc']:
     src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/gcc/startup_es32f36xx.S']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/keil/startup_es32f36xx.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/iar/startup_es32f36xx.s']

 path = [cwd + '/CMSIS/Device/EastSoft/ES32F36xx/Include',
--- a/bsp/fm33lc026/SConstruct
+++ b/bsp/fm33lc026/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map'])
--- a/bsp/fm33lc026/board/SConscript
+++ b/bsp/fm33lc026/board/SConscript
@@ -19,7 +19,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/gcc/startup_fm33lc0xx.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/ARM/startup_fm33lc0xx.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/iar/startup_fm33lc0xx.s']

 # FM33LC0XX
--- a/bsp/frdm-k64f/SConstruct
+++ b/bsp/frdm-k64f/SConstruct
@@ -20,7 +20,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
 	env.Replace(ARFLAGS = [''])
 	env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
--- a/bsp/frdm-k64f/device/SConscript
+++ b/bsp/frdm-k64f/device/SConscript
@@ -17,7 +17,7 @@ if rtconfig.PLATFORM in ['gcc']:
     path += [cwd + 'TOOLCHAIN_GCC_ARM']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src = src + ['TOOLCHAIN_ARM_STD/startup_MK64F12.s']
-# elif rtconfig.CROSS_TOOL == 'iar':
+# elif rtconfig.PLATFORM in ['iccarm']:

 CPPDEFINES = ['CPU_MK64FN1M0VLL12']

--- a/bsp/ft32/ft32f072xb-starter/SConstruct
+++ b/bsp/ft32/ft32f072xb-starter/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
--- a/bsp/ft32/ft32f072xb-starter/board/SConscript
+++ b/bsp/ft32/ft32f072xb-starter/board/SConscript
@@ -19,7 +19,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/gcc/startup_ft32f072xb.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/arm/startup_ft32f072xb.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/iar/startup_ft32f072xb.s']

 # FT32F072x8 || FT32F072xB
--- a/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript
+++ b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript
@@ -9,7 +9,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src = src + ['start_gcc.S']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src = src + ['start_rvds.S']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src = src + ['start_iar.S']
    
 CPPPATH = [GetCurrentDir()]
--- a/bsp/fujitsu/mb9x/mb9bf500r/SConstruct
+++ b/bsp/fujitsu/mb9x/mb9bf500r/SConstruct
@@ -20,7 +20,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/fujitsu/mb9x/mb9bf506r/SConstruct
+++ b/bsp/fujitsu/mb9x/mb9bf506r/SConstruct
@@ -20,7 +20,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript
+++ b/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript
@@ -11,7 +11,7 @@ if rtconfig.PLATFORM in ['gcc']:
    src += ['Device/FUJISTU/MB9BF50x/Source/G++/startup_mb9bf50x.S']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
    src += ['Device/FUJISTU/MB9BF50x/Source/ARM/startup_mb9bf50x.S']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
    src += ['Device/FUJISTU/MB9BF50x/Source/IAR/startup_mb9bf50x.S']

 CPPPATH = [cwd + '/Device/FUJISTU/MB9BF50x/Include']
--- a/bsp/fujitsu/mb9x/mb9bf568r/SConstruct
+++ b/bsp/fujitsu/mb9x/mb9bf568r/SConstruct
@@ -21,7 +21,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
 	env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
 	env.Replace(ARFLAGS = [''])
 	env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
--- a/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript
+++ b/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript
@@ -12,7 +12,7 @@ if rtconfig.PLATFORM in ['gcc']:
 	src += ['DeviceSupport/fujitsu/mb9bf61x/startup/gcc/startup_mb9bf61x.c']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
 	src += ['DeviceSupport/fujitsu/mb9bf61x/startup/arm/startup_mb9bf61x.S']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
 	src += ['DeviceSupport/fujitsu/mb9bf61x/startup/iar/startup_mb9bf61x.S']

 CPPDEFINES = [rtconfig.FM3_TYPE]
--- a/bsp/fujitsu/mb9x/mb9bf618s/SConstruct
+++ b/bsp/fujitsu/mb9x/mb9bf618s/SConstruct
@@ -20,7 +20,7 @@ env = Environment(tools = ['mingw'],
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map project.map')
--- a/bsp/gd32/gd32103c-eval/SConstruct
+++ b/bsp/gd32/gd32103c-eval/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
    LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
    env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
    env.Replace(ARFLAGS = [''])
    env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
--- a/Show More
+++ b/Show More