Merge pull request #2167 from lf-lang/zephyr-esp-issue

Use Zephyr's CMake extension to correctly build and link reactor-c
lf-lang · Jan 27, 2024 · 36b3d4a · 36b3d4a
2 parents fb0ab5c + b19a61f
commit 36b3d4a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -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/)");
@@ -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) {

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
diff --git a/test/C/src/zephyr/unthreaded/picolib/Picolib.lf b/test/C/src/zephyr/unthreaded/picolib/Picolib.lf
@@ -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");
+  =}
+}
diff --git a/test/C/src/zephyr/unthreaded/picolib/prj.conf b/test/C/src/zephyr/unthreaded/picolib/prj.conf
@@ -0,0 +1,2 @@
+CONFIG_NEWLIB_LIBC=n 
+CONFIG_PICOLIBC=y
+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