add ubsan runtime

ZigEmbeddedGroup · Apr 11, 2024 · b334a0b · b334a0b
1 parent bd50686
commit b334a0b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/build.zig b/build.zig
@@ -2,7 +2,9 @@ const std = @import("std");
 const Build = std.Build;
 const LazyPath = Build.LazyPath;
 
-const c_flags = &.{};
+const c_flags = &.{
+    "-fno-sanitize-trap=undefined",
+};
 
 pub fn init(b: *Build, dependency_name: []const u8) *STLink {
     const st = b.allocator.create(STLink) catch @panic("OOM");
@@ -21,8 +23,13 @@ pub fn build(b: *Build) void {
         .target = target,
         .optimize = optimize,
     });
+    const ubsan_runtime_dep = b.dependency("ubsan-runtime", .{
+        .target = target,
+        .optimize = optimize,
+    });
 
     const libusb = libusb_dep.artifact("usb");
+    const ubsan_runtime = ubsan_runtime_dep.artifact("ubsan-runtime");
 
     const version = b.addConfigHeader(.{
         .style = .{
@@ -118,6 +125,7 @@ pub fn build(b: *Build) void {
     st_flash.addConfigHeader(version);
     st_flash.linkLibrary(stlink);
     st_flash.linkLibrary(libusb);
+    st_flash.linkLibrary(ubsan_runtime);
     b.installArtifact(st_flash);
 
     const st_info = b.addExecutable(.{
@@ -135,6 +143,7 @@ pub fn build(b: *Build) void {
     st_info.addConfigHeader(version);
     st_info.linkLibrary(stlink);
     st_info.linkLibrary(libusb);
+    st_info.linkLibrary(ubsan_runtime);
     b.installArtifact(st_info);
 
     const st_util = b.addExecutable(.{
@@ -158,6 +167,7 @@ pub fn build(b: *Build) void {
     st_util.addConfigHeader(version);
     st_util.linkLibrary(stlink);
     st_util.linkLibrary(libusb);
+    st_util.linkLibrary(ubsan_runtime);
     b.installArtifact(st_util);
 
     const st_trace = b.addExecutable(.{
@@ -175,6 +185,7 @@ pub fn build(b: *Build) void {
     st_trace.addConfigHeader(version);
     st_trace.linkLibrary(stlink);
     st_trace.linkLibrary(libusb);
+    st_trace.linkLibrary(ubsan_runtime);
     b.installArtifact(st_trace);
 }
 

diff --git a/build.zig.zon b/build.zig.zon
@@ -6,5 +6,9 @@
             .url = "https://github.com/ZigEmbeddedGroup/libusb/archive/347fecde82bd953f5cb71aaa7060b38c9e364ed0.tar.gz",
             .hash = "1220797b3fae1791cf477f11c2b0a71bc053351053eff7f960873190093398a0581a",
         },
+        .@"ubsan-runtime" = .{
+            .url = "https://github.com/mattnite/ubsan-runtime/archive/c1e153c89f5ba2796817cce91e031ce5a764debd.tar.gz",
+            .hash = "1220ceb568e87c13985faef7b388b9422ab0fab42b5a2197f415f67a947641faefd9",
+        },
     },
 }