fix: esp32p4-xesppie fmt-slice bug

kassane · Aug 17, 2024 · e785e97 · e785e97
1 parent 71731e3
commit e785e97
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/build.zig b/build.zig
@@ -593,13 +593,12 @@ const riscv_targets = &[_]std.Target.Query{
         .abi = .none,
         .cpu_features_add = std.Target.riscv.featureSet(&.{ .m, .a, .c }),
     },
-    // esp32-p4
+    // esp32-p4 have .xesppie cpu-feature (espressif vendor extension)
     .{
         .cpu_arch = .riscv32,
         .cpu_model = .{ .explicit = &std.Target.riscv.cpu.esp32p4 },
         .os_tag = .freestanding,
         .abi = .eabihf,
-        .cpu_features_sub = std.Target.riscv.featureSet(&.{.xesppie}), // FIXME
     },
 };
 const xtensa_targets = &[_]std.Target.Query{

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -68,7 +68,7 @@ if(CONFIG_IDF_TARGET_ARCH_RISCV)
         set(TARGET_CPU_MODEL "generic_rv32+m+a+c")
     elseif(CONFIG_IDF_TARGET_ESP32P4)
         string(REGEX REPLACE "-none" "-eabihf" ZIG_TARGET ${ZIG_TARGET})
-        set(TARGET_CPU_MODEL "esp32p4-xesppie")
+        set(TARGET_CPU_MODEL "esp32p4")
     else()
         set(TARGET_CPU_MODEL "generic_rv32+m+c")
     endif()

diff --git a/main/lib.zig b/main/lib.zig
@@ -24,7 +24,7 @@ export fn app_main() callconv(.C) void {
         \\* Compiler Backend: {s}
         \\
     , .{
-        builtin.zig_version_string,
+        @as([]const u8, builtin.zig_version_string), // fix esp32p4(.xesppie) fmt-slice bug
         @tagName(builtin.zig_backend),
     });