Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Zephyr's CMake extension to correctly build and link reactor-c #2167

Merged
merged 12 commits into from
Jan 27, 2024
Merged

Use Zephyr's CMake extension to correctly build and link reactor-c #2167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
55c3be3
Rename C runtime lib from core to reactor-c
erlingrj Jan 26, 2024
d25d7a4
Remove explicit linking with Zephyr sources. Will handle it inside re…
erlingrj Jan 26, 2024
65fb1fe
Merge remote-tracking branch 'origin/master' into zephyr-esp-issue
erlingrj Jan 26, 2024
bc7eb5a
bump reactor-c
erlingrj Jan 26, 2024
ef1cff7
Bump reactor-c
erlingrj Jan 26, 2024
9a85be1
Bump reactor-c
erlingrj Jan 26, 2024
ccda0ce
Bump reactor-c
erlingrj Jan 26, 2024
810796d
Bump reactor-c
erlingrj Jan 26, 2024
e8f8c2a
Bump reactor-c
erlingrj Jan 27, 2024
05cd09f
BUmp reactor-c
erlingrj Jan 27, 2024
5b05a25
Spotless
erlingrj Jan 27, 2024
b19a61f
Merge remote-tracking branch 'origin/master' into zephyr-esp-issue
erlingrj Jan 27, 2024
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
6 changes: 1 addition & 5 deletions core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ CodeBuilder generateCMakeCode(
cMakeCode.pr(" target_link_libraries(${LF_MAIN_TARGET} PUBLIC ${MATH_LIBRARY})");
cMakeCode.pr("endif()");

cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE core)");
cMakeCode.pr("target_link_libraries(${LF_MAIN_TARGET} PRIVATE reactor-c)");

cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC .)");
cMakeCode.pr("target_include_directories(${LF_MAIN_TARGET} PUBLIC include/)");
Expand Down Expand Up @@ -472,10 +472,6 @@ private static String setUpMainTargetZephyr(
boolean hasMain, String executableName, Stream<String> cSources) {
var code = new CodeBuilder();
code.pr("add_subdirectory(core)");
code.pr("target_link_libraries(core PUBLIC zephyr_interface)");
// FIXME: Linking the reactor-c corelib with the zephyr kernel lib
// resolves linker issues but I am not yet sure if it is safe
code.pr("target_link_libraries(core PRIVATE kernel)");
code.newLine();

if (hasMain) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Open in desktop
Submodule reactor-c updated 11 files
+3 −2 CMakeLists.txt
+37 −28 core/CMakeLists.txt
+46 −18 core/environment.c
+1 −2 core/federated/CMakeLists.txt
+1 −2 core/federated/network/CMakeLists.txt
+1 −2 core/modal_models/CMakeLists.txt
+16 −18 core/platform/CMakeLists.txt
+1 −2 core/threaded/CMakeLists.txt
+1 −2 core/utils/CMakeLists.txt
+1 −2 core/utils/hashset/CMakeLists.txt
+1 −1 lingua-franca-ref.txt
15 changes: 15 additions & 0 deletions test/C/src/zephyr/unthreaded/picolib/Picolib.lf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// A smoke test verifying that we can compile and run using picolibc also.
target C {
platform: "Zephyr",
timeout: 10 sec,
fast: true,
files: "prj.conf"
}

main reactor {
timer t(0, 1 sec)

reaction(t) {=
printf("Hello\n");
=}
}
2 changes: 2 additions & 0 deletions test/C/src/zephyr/unthreaded/picolib/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CONFIG_NEWLIB_LIBC=n
CONFIG_PICOLIBC=y
Loading