libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1161 from zhaojuntao/Fix-IAR-Version-Problem

Browse Source 
Fix-IAR-Version-Problem
This commit is contained in:
Bernard Xiong 2018-01-10 19:58:28 +08:00 committed by GitHub
commit f54c8bab3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp/imxrt1052-evk/applications/SConscript
View File

@ -7,9 +7,7 @@ src = Glob('*.c')
CPPPATH = [cwd, str(Dir('#'))] CPPPATH = [cwd, str(Dir('#'))]
# add for startup script # add for startup script
if rtconfig.CROSS_TOOL == 'iar': if rtconfig.CROSS_TOOL == 'gcc':
CPPDEFINES = ['_TIMESPEC_DEFINED']
elif rtconfig.CROSS_TOOL == 'gcc':
CPPDEFINES = ['__START=entry'] CPPDEFINES = ['__START=entry']
else: else:
CPPDEFINES = [] CPPDEFINES = []

8
bsp/lpc54608-LPCXpresso/applications/SConscript
View File

@ -6,12 +6,6 @@ cwd = os.path.join(str(Dir('#')), 'applications')
src = Glob('*.c') src = Glob('*.c')
CPPPATH = [cwd, str(Dir('#'))] CPPPATH = [cwd, str(Dir('#'))]
# add for startup script group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
if rtconfig.CROSS_TOOL == 'iar':
CPPDEFINES = ['_TIMESPEC_DEFINED']
else:
CPPDEFINES = []
group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES)
Return('group') Return('group')

8
bsp/stm32f429-apollo/applications/SConscript
View File

@ -8,16 +8,10 @@ application.c
startup.c startup.c
""") """)
# add for startup script
if rtconfig.CROSS_TOOL == 'iar':
CPPDEFINES = ['_TIMESPEC_DEFINED']
else:
CPPDEFINES = []
# add UI engine demo. # add UI engine demo.
if GetDepend('RT_USING_GUIENGINE'): if GetDepend('RT_USING_GUIENGINE'):
src += ['rtgui_demo.c'] src += ['rtgui_demo.c']
group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES) group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
Return('group') Return('group')

4
components/libc/compilers/dlib/sys/time.h
View File

@ -20,6 +20,10 @@ struct timeval {
}; };
#endif /* _TIMEVAL_DEFINED */ #endif /* _TIMEVAL_DEFINED */
#if defined ( __ICCARM__ ) && (__VER__ >= 8011002)
#define _TIMESPEC_DEFINED
#endif
#ifndef _TIMESPEC_DEFINED #ifndef _TIMESPEC_DEFINED
#define _TIMESPEC_DEFINED #define _TIMESPEC_DEFINED
/* /*