Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp/stm32/stm32l496-ali-developer/board/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ path += [cwd + '/ports']

startup_path_prefix = SDK_LIB

if rtconfig.CROSS_TOOL == 'gcc':
if rtconfig.CROSS_TOOL == 'gcc' or rtconfig.CROSS_TOOL == 'clang':
src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l496xx.s']
elif rtconfig.CROSS_TOOL == 'keil':
src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l496xx.s']
Expand Down
35 changes: 35 additions & 0 deletions bsp/stm32/stm32l496-ali-developer/rtconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
elif CROSS_TOOL == 'clang':
PLATFORM = 'clang'
EXEC_PATH = r'D:\envs\LLVMEmbeddedToolchainForArm-13.0.0\bin'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -176,6 +179,38 @@
EXEC_PATH = EXEC_PATH + '/arm/bin/'
POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'

elif PLATFORM == 'clang':
# toolchains
PREFIX = 'llvm-'
CC = 'clang'
AS = 'clang'
AR = PREFIX + 'ar'
CXX = 'clang++'
LINK = 'clang'
TARGET_EXT = 'elf'
SIZE = PREFIX + 'size'
OBJDUMP = PREFIX + 'objdump'
OBJCPY = PREFIX + 'objcopy'

DEVICE = ' --config armv7em_hard_fpv4_sp_d16_nosys'
CFLAGS = DEVICE
AFLAGS = ' -c' + DEVICE + ' -Wa,-mimplicit-it=thumb ' ## -x assembler-with-cpp
LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rt-thread.map,-u,Reset_Handler -T board/linker_scripts/link.lds'

CPATH = ''
LPATH = ''

if BUILD == 'debug':
CFLAGS += ' -O0 -gdwarf-2 -g'
AFLAGS += ' -gdwarf-2'
else:
CFLAGS += ' -O2'

CXXFLAGS = CFLAGS

POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'


def dist_handle(BSP_ROOT, dist_dir):
import sys
cwd_path = os.getcwd()
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/spi/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if GetDepend('RT_USING_SFUD'):
CPPPATH += [cwd + '/sfud/inc']
if GetDepend('RT_SFUD_USING_SFDP'):
src_device += ['sfud/src/sfud_sfdp.c']
if rtconfig.CROSS_TOOL == 'gcc':
if rtconfig.CROSS_TOOL == 'gcc' or rtconfig.CROSS_TOOL == 'clang':
LOCAL_CCFLAGS += ' -std=c99'
elif rtconfig.CROSS_TOOL == 'keil':
if rtconfig.PLATFORM == 'armcc':
Expand Down
2 changes: 1 addition & 1 deletion components/libc/compilers/common/nogcc/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ group = []
if GetDepend('RT_USING_LIBC'):
src += Glob('*.c')

if rtconfig.PLATFORM != 'gcc' or rtconfig.ARCH == 'sim':
if (rtconfig.PLATFORM != 'gcc' and rtconfig.PLATFORM != 'clang') or rtconfig.ARCH == 'sim':
group = DefineGroup('libc', src, depend = [], CPPPATH = CPPPATH)
Return('group')
2 changes: 1 addition & 1 deletion components/libc/compilers/gcc/newlib/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ group = []
LIBS = ['m'] # link libm
CPPPATH = [cwd]

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'clang':
if GetDepend('RT_USING_LIBC'):
LIBS += ['c'] # link libc
src += Glob('*.c')
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/cortex-m4/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang':
if rtconfig.PLATFORM == 'armclang':
src += Glob('*_rvds.S')

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'clang':
src += Glob('*_init.S')
src += Glob('*_gcc.S')

Expand Down
2 changes: 1 addition & 1 deletion tools/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def spawn(self, sh, escape, cmd, args, env):
def GenCconfigFile(env, BuildOptions):
import rtconfig

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'clang':
contents = ''
if not os.path.isfile('cconfig.h'):
import gcc
Expand Down