softonik/tinygo
1
0
Ответвление 0
Код Задачи Слияния Проекты Выпуски Пакеты Вики Активность Действия

Revert "Bump CMSIS to 5.9.0"

Просмотр исходного кода 
This reverts commit 92be61534e.
Этот коммит содержится в:
Ron Evans 2022-12-16 19:10:30 +01:00
родитель 92be61534e
коммит 69a284bd36
7 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать .patch Скачать .diff Показать все файлы Свернуть все файлы

2
.gitmodules предоставленный
Просмотреть файл

@ -3,7 +3,7 @@
url = https://github.com/NordicSemiconductor/nrfx.git url = https://github.com/NordicSemiconductor/nrfx.git
[submodule "lib/CMSIS"] [submodule "lib/CMSIS"]
path = lib/CMSIS path = lib/CMSIS
url = https://github.com/ARM-software/CMSIS_5.git url = https://github.com/ARM-software/CMSIS.git
[submodule "lib/avr"] [submodule "lib/avr"]
path = lib/avr path = lib/avr
url = https://github.com/avr-rust/avr-mcu.git url = https://github.com/avr-rust/avr-mcu.git

4
Makefile
Просмотреть файл

@ -748,7 +748,7 @@ wasmtest:
build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen) build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
@mkdir -p build/release/tinygo/bin @mkdir -p build/release/tinygo/bin
@mkdir -p build/release/tinygo/lib/clang/include @mkdir -p build/release/tinygo/lib/clang/include
@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS/Core @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
@mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/macos-minimal-sdk
@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-headers/defaults @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-headers/defaults
@ -768,7 +768,7 @@ ifneq ($(USE_SYSTEM_BINARYEN),1)
@cp -p build/wasm-opt$(EXE) build/release/tinygo/bin @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
endif endif
@cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
@cp -rp lib/CMSIS/CMSIS/Core/Include build/release/tinygo/lib/CMSIS/CMSIS/Core @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
@cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
@cp -rp lib/musl/arch/aarch64 build/release/tinygo/lib/musl/arch @cp -rp lib/musl/arch/aarch64 build/release/tinygo/lib/musl/arch

2
lib/CMSIS

@ -1 +1 @@
Subproject commit 2b7495b8535bdcb306dac29b9ded4cfb679d7e5c Subproject commit 9fe411cef1cef5de58e5957b89760759de44e393

2
targets/nrf51.json
Просмотреть файл

@ -3,7 +3,7 @@
"build-tags": ["nrf51822", "nrf51", "nrf"], "build-tags": ["nrf51822", "nrf51", "nrf"],
"cflags": [ "cflags": [
"-DNRF51", "-DNRF51",
"-I{root}/lib/CMSIS/CMSIS/Core/Include", "-I{root}/lib/CMSIS/CMSIS/Include",
"-I{root}/lib/nrfx/mdk" "-I{root}/lib/nrfx/mdk"
], ],
"linkerscript": "targets/nrf51.ld", "linkerscript": "targets/nrf51.ld",

2
targets/nrf52.json
Просмотреть файл

@ -3,7 +3,7 @@
"build-tags": ["nrf52", "nrf"], "build-tags": ["nrf52", "nrf"],
"cflags": [ "cflags": [
"-DNRF52832_XXAA", "-DNRF52832_XXAA",
"-I{root}/lib/CMSIS/CMSIS/Core/Include", "-I{root}/lib/CMSIS/CMSIS/Include",
"-I{root}/lib/nrfx/mdk" "-I{root}/lib/nrfx/mdk"
], ],
"linkerscript": "targets/nrf52.ld", "linkerscript": "targets/nrf52.ld",

2
targets/nrf52833.json
Просмотреть файл

@ -3,7 +3,7 @@
"build-tags": ["nrf52833", "nrf"], "build-tags": ["nrf52833", "nrf"],
"cflags": [ "cflags": [
"-DNRF52833_XXAA", "-DNRF52833_XXAA",
"-I{root}/lib/CMSIS/CMSIS/Core/Include", "-I{root}/lib/CMSIS/CMSIS/Include",
"-I{root}/lib/nrfx/mdk" "-I{root}/lib/nrfx/mdk"
], ],
"linkerscript": "targets/nrf52833.ld", "linkerscript": "targets/nrf52833.ld",

2
targets/nrf52840.json
Просмотреть файл

@ -3,7 +3,7 @@
"build-tags": ["nrf52840", "nrf"], "build-tags": ["nrf52840", "nrf"],
"cflags": [ "cflags": [
"-DNRF52840_XXAA", "-DNRF52840_XXAA",
"-I{root}/lib/CMSIS/CMSIS/Core/Include", "-I{root}/lib/CMSIS/CMSIS/Include",
"-I{root}/lib/nrfx/mdk" "-I{root}/lib/nrfx/mdk"
], ],
"linkerscript": "targets/nrf52840.ld", "linkerscript": "targets/nrf52840.ld",