Skip to content

Commit 0893385

Browse files
mtomczykmobicamplatings
authored andcommitted
.cfg suffix is no longer automatically added to --config
Since https://reviews.llvm.org/D134208 --config armv6m_soft_nofp_semihost no longer works because the feature to automatically append .cfg was removed. This breaks the smoke tests and the documented behaviour of BMT. Fix by added .cfg suffix to every --config option in documentation and examples.
1 parent f5108ac commit 0893385

File tree

10 files changed

+10
-9
lines changed

10 files changed

+10
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1414

1515
- Replaced newlib with [picolibc](https://github.com/picolibc/picolibc) (GitHub issue #61)
1616
- Renamed and updated configuration files
17+
- Configuration files must now be specified including the file name suffix e.g. `--config armv6m_soft_nofp.cfg`
1718

1819
### Removed
1920

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ For example:
9090

9191
```
9292
$ PATH=<install-dir>/LLVMEmbeddedToolchainForArm-<revision>/bin:$PATH
93-
$ clang --config armv6m_soft_nofp_semihost -T picolibc.ld -o example example.c
93+
$ clang --config armv6m_soft_nofp_semihost.cfg -T picolibc.ld -o example example.c
9494
```
9595

9696
The available configuration files can be listed using:

samples/src/baremetal-semihosting/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include ../../Makefile.conf
2020
build: hello.elf
2121

2222
hello.elf: *.c
23-
$(BIN_PATH)/clang --config armv6m_soft_nofp_semihost -g -T ../../ldscripts/microbit.ld -o hello.elf $^
23+
$(BIN_PATH)/clang --config armv6m_soft_nofp_semihost.cfg -g -T ../../ldscripts/microbit.ld -o hello.elf $^
2424

2525
%.hex: %.elf
2626
$(BIN_PATH)/llvm-objcopy -O ihex $< $@

samples/src/baremetal-semihosting/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ if exist hello.hex del /q hello.hex
4949
@exit /B 1
5050

5151
:build_fn
52-
%BIN_PATH%\clang.exe --config armv6m_soft_nofp_semihost -g -T ..\..\ldscripts\microbit.ld -o hello.elf hello.c
52+
%BIN_PATH%\clang.exe --config armv6m_soft_nofp_semihost.cfg -g -T ..\..\ldscripts\microbit.ld -o hello.elf hello.c
5353
%BIN_PATH%\llvm-objcopy.exe -O ihex hello.elf hello.hex
5454
@exit /B

samples/src/baremetal-uart/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include ../../Makefile.conf
2020
build: hello.elf
2121

2222
hello.elf: *.c
23-
$(BIN_PATH)/clang --config armv6m_soft_nofp -g -T ../../ldscripts/microbit.ld -o hello.elf $^
23+
$(BIN_PATH)/clang --config armv6m_soft_nofp.cfg -g -T ../../ldscripts/microbit.ld -o hello.elf $^
2424

2525
%.hex: %.elf
2626
$(BIN_PATH)/llvm-objcopy -O ihex $< $@

samples/src/baremetal-uart/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ if exist hello.hex del /q hello.hex
4949
@exit /B 1
5050

5151
:build_fn
52-
%BIN_PATH%\clang.exe --config armv6m_soft_nofp -g -T ..\..\ldscripts\microbit.ld -o hello.elf hello.c
52+
%BIN_PATH%\clang.exe --config armv6m_soft_nofp.cfg -g -T ..\..\ldscripts\microbit.ld -o hello.elf hello.c
5353
%BIN_PATH%\llvm-objcopy.exe -O ihex hello.elf hello.hex
5454
@exit /B

samples/src/cpp-baremetal-semihosting/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include ../../Makefile.conf
2020
build: hello.elf
2121

2222
hello.elf: *.cpp
23-
$(BIN_PATH)/clang++ --config armv6m_soft_nofp_semihost -g -T ../../ldscripts/microbit.ld -o hello.elf $^
23+
$(BIN_PATH)/clang++ --config armv6m_soft_nofp_semihost.cfg -g -T ../../ldscripts/microbit.ld -o hello.elf $^
2424

2525
%.hex: %.elf
2626
$(BIN_PATH)/llvm-objcopy -O ihex $< $@

samples/src/cpp-baremetal-semihosting/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ if exist hello.hex del /q hello.hex
4949
@exit /B 1
5050

5151
:build_fn
52-
%BIN_PATH%\clang++.exe --config armv6m_soft_nofp_semihost -g -T ..\..\ldscripts\microbit.ld -o hello.elf hello.cpp
52+
%BIN_PATH%\clang++.exe --config armv6m_soft_nofp_semihost.cfg -g -T ..\..\ldscripts\microbit.ld -o hello.elf hello.cpp
5353
%BIN_PATH%\llvm-objcopy.exe -O ihex hello.elf hello.hex
5454
@exit /B

tests/smoketests/basic-semihosting/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ build: hello.elf
1919

2020
hello.elf: *.c
2121
@$(BIN_PATH)/clang \
22-
--config armv6m_soft_nofp_semihost \
22+
--config armv6m_soft_nofp_semihost.cfg \
2323
-T ../../../samples/ldscripts/microbit.ld \
2424
-g \
2525
-o hello.elf \

tests/smoketests/cpp-basic-semihosting/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ build: hello.elf
1919

2020
hello.elf: *.cpp
2121
@$(BIN_PATH)/clang++ \
22-
--config armv6m_soft_nofp_semihost \
22+
--config armv6m_soft_nofp_semihost.cfg \
2323
-T ../../../samples/ldscripts/microbit.ld \
2424
-g \
2525
-o hello.elf \

0 commit comments

Comments
 (0)