提交 a97d7d29 编写于 作者: D dzzxzz

fix scons+iar compile error in Fujistu FM3 branch

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1679 bbd45198-f89e-11dd-88c7-29a3b14d5316
上级 11488d14
...@@ -22,6 +22,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) ...@@ -22,6 +22,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar': if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
env.Replace(ARFLAGS = '')
Export('RTT_ROOT') Export('RTT_ROOT')
Export('rtconfig') Export('rtconfig')
......
# toolchains options # toolchains options
ARCH='arm' ARCH='arm'
CPU='fm3' CPU='fm3'
CROSS_TOOL='gcc' CROSS_TOOL='iar'
# cross_tool provides the cross compiler # cross_tool provides the cross compiler
# EXEC_PATH is the compiler execute path, for example, CodeSourcery, Keil MDK, IAR # EXEC_PATH is the compiler execute path, for example, CodeSourcery, Keil MDK, IAR
...@@ -14,7 +14,7 @@ elif CROSS_TOOL == 'keil': ...@@ -14,7 +14,7 @@ elif CROSS_TOOL == 'keil':
EXEC_PATH = 'C:/Keil' EXEC_PATH = 'C:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iar'
IAR_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0' IAR_PATH = 'C:\Program Files\IAR Systems\Embedded Workbench 6.0 Evaluation'
BUILD = 'debug' BUILD = 'debug'
...@@ -80,8 +80,6 @@ elif PLATFORM == 'iar': ...@@ -80,8 +80,6 @@ elif PLATFORM == 'iar':
LINK = 'ilinkarm' LINK = 'ilinkarm'
TARGET_EXT = 'out' TARGET_EXT = 'out'
DEVICE = ' --cpu DARMSTM --thumb'
CFLAGS = '' CFLAGS = ''
CFLAGS += ' --diag_suppress Pa050' CFLAGS += ' --diag_suppress Pa050'
CFLAGS += ' --no_cse' CFLAGS += ' --no_cse'
...@@ -96,9 +94,9 @@ elif PLATFORM == 'iar': ...@@ -96,9 +94,9 @@ elif PLATFORM == 'iar':
CFLAGS += ' --cpu=Cortex-M3' CFLAGS += ' --cpu=Cortex-M3'
CFLAGS += ' -e' CFLAGS += ' -e'
CFLAGS += ' --fpu=None' CFLAGS += ' --fpu=None'
CFLAGS += ' --dlib_config "' + IAR_PATH + '/arm/INC/DLib_Config_Normal.h"' CFLAGS += ' --dlib_config "' + IAR_PATH + '/arm/INC/c/DLib_Config_Normal.h"'
CFLAGS += ' -Ol' CFLAGS += ' -Ol'
CFLAGS += ' -I"' + IAR_PATH + '/arm/inc"' CFLAGS += ' --use_c++_inline'
AFLAGS = '' AFLAGS = ''
AFLAGS += ' -s+' AFLAGS += ' -s+'
...@@ -108,10 +106,9 @@ elif PLATFORM == 'iar': ...@@ -108,10 +106,9 @@ elif PLATFORM == 'iar':
AFLAGS += ' --fpu None' AFLAGS += ' --fpu None'
AFLAGS += ' -I"' + IAR_PATH + '/arm/INC"' AFLAGS += ' -I"' + IAR_PATH + '/arm/INC"'
LFLAGS = ' --config stm32f10x_flash.icf' LFLAGS = ' --config mb9bf500r.icf'
LFLAGS += ' --redirect _Printf=_PrintfTiny' LFLAGS += ' --semihosting'
LFLAGS += ' --redirect _Scanf=_ScanfSmall'
LFLAGS += ' --entry __iar_program_start' LFLAGS += ' --entry __iar_program_start'
EXEC_PATH = IAR_PATH + '/arm/bin/' EXEC_PATH = IAR_PATH + '/arm/bin/'
POST_ACTION = '' POST_ACTION = 'ielftool.exe --srec --verbose $TARGET rtthread.srec'
...@@ -22,6 +22,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) ...@@ -22,6 +22,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar': if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
env.Replace(ARFLAGS = '')
Export('RTT_ROOT') Export('RTT_ROOT')
Export('rtconfig') Export('rtconfig')
......
...@@ -14,7 +14,7 @@ elif CROSS_TOOL == 'keil': ...@@ -14,7 +14,7 @@ elif CROSS_TOOL == 'keil':
EXEC_PATH = 'C:/Keil' EXEC_PATH = 'C:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iar'
IAR_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0' IAR_PATH = 'C:\Program Files\IAR Systems\Embedded Workbench 6.0 Evaluation'
BUILD = 'debug' BUILD = 'debug'
...@@ -79,8 +79,6 @@ elif PLATFORM == 'iar': ...@@ -79,8 +79,6 @@ elif PLATFORM == 'iar':
LINK = 'ilinkarm' LINK = 'ilinkarm'
TARGET_EXT = 'out' TARGET_EXT = 'out'
DEVICE = ' --cpu DARMSTM --thumb'
CFLAGS = '' CFLAGS = ''
CFLAGS += ' --diag_suppress Pa050' CFLAGS += ' --diag_suppress Pa050'
CFLAGS += ' --no_cse' CFLAGS += ' --no_cse'
...@@ -95,9 +93,9 @@ elif PLATFORM == 'iar': ...@@ -95,9 +93,9 @@ elif PLATFORM == 'iar':
CFLAGS += ' --cpu=Cortex-M3' CFLAGS += ' --cpu=Cortex-M3'
CFLAGS += ' -e' CFLAGS += ' -e'
CFLAGS += ' --fpu=None' CFLAGS += ' --fpu=None'
CFLAGS += ' --dlib_config "' + IAR_PATH + '/arm/INC/DLib_Config_Normal.h"' CFLAGS += ' --dlib_config "' + IAR_PATH + '/arm/INC/c/DLib_Config_Normal.h"'
CFLAGS += ' -Ol' CFLAGS += ' -Ol'
CFLAGS += ' -I"' + IAR_PATH + '/arm/inc"' CFLAGS += ' --use_c++_inline'
AFLAGS = '' AFLAGS = ''
AFLAGS += ' -s+' AFLAGS += ' -s+'
...@@ -107,10 +105,9 @@ elif PLATFORM == 'iar': ...@@ -107,10 +105,9 @@ elif PLATFORM == 'iar':
AFLAGS += ' --fpu None' AFLAGS += ' --fpu None'
AFLAGS += ' -I"' + IAR_PATH + '/arm/INC"' AFLAGS += ' -I"' + IAR_PATH + '/arm/INC"'
LFLAGS = ' --config stm32f10x_flash.icf' LFLAGS = ' --config mb9bf506.icf'
LFLAGS += ' --redirect _Printf=_PrintfTiny' LFLAGS += ' --semihosting'
LFLAGS += ' --redirect _Scanf=_ScanfSmall'
LFLAGS += ' --entry __iar_program_start' LFLAGS += ' --entry __iar_program_start'
EXEC_PATH = IAR_PATH + '/arm/bin/' EXEC_PATH = IAR_PATH + '/arm/bin/'
POST_ACTION = '' POST_ACTION = 'ielftool.exe --srec --verbose $TARGET rtthread.srec'
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册