Merge pull request #4676 from OpenNuvoton/miss_rvds_s_armclang

[libcpu][arm][cortex-m23]Correct rvds.S including for armclang platform.
This commit is contained in:
Bernard Xiong 2021-05-13 20:51:34 +08:00 committed by GitHub
commit 484cda4d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -41,7 +41,6 @@ Support GCC, MDK5, IAR IDE/compilers. More information of these compiler version
Notice: Notice:
(1) Please install Nu-Link_Keil_Driver or Nu-Link_IAR_Driver for development. (1) Please install Nu-Link_Keil_Driver or Nu-Link_IAR_Driver for development.
(2) You must remove '--c99' flag in <path/to/rtt>/components/drivers/spi/SConscript before generating MDK5 project file.
## 3. Program firmware ## 3. Program firmware
### Step 1: ### Step 1:

View File

@ -15,7 +15,7 @@ if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc' PLATFORM = 'gcc'
EXEC_PATH = r'C:\Program Files (x86)\GNU Tools ARM Embedded\6 2017-q1-update\bin' EXEC_PATH = r'C:\Program Files (x86)\GNU Tools ARM Embedded\6 2017-q1-update\bin'
elif CROSS_TOOL == 'keil': elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armclang'
EXEC_PATH = r'C:\Keil_v5' EXEC_PATH = r'C:\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iar'
@ -56,9 +56,9 @@ if PLATFORM == 'gcc':
POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
elif PLATFORM == 'armcc': elif PLATFORM == 'armclang':
# toolchains # toolchains
CC = 'armcc' CC = 'armclang'
AS = 'armasm' AS = 'armasm'
AR = 'armar' AR = 'armar'
LINK = 'armlink' LINK = 'armlink'

View File

@ -10,6 +10,8 @@ CPPPATH = [cwd]
if rtconfig.PLATFORM == 'armcc': if rtconfig.PLATFORM == 'armcc':
src += Glob('*_rvds.S') src += Glob('*_rvds.S')
elif rtconfig.PLATFORM == 'armclang':
src += Glob('*_rvds.S')
if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'gcc':
src += Glob('*_init.S') src += Glob('*_init.S')