Merge pull request #32 from parca-dev/update-binary

Fix Segfault and Update toy JIT binary for x86

build.go

@@ -200,6 +200,16 @@ func (Build) Go() error {
 			errs = errors.Join(errs, err)
 		}
 	}
+	for _, vr := range cppBuildVariantsArm64 {
+		if err := buildCpp(host, vr.src, vr.name, vr.flags...); err != nil {
+			errs = errors.Join(errs, err)
+		}
+	}
+	for _, vr := range cppBuildVariantsX86 {
+		if err := buildCpp(host, vr.src, vr.name, vr.flags...); err != nil {
+			errs = errors.Join(errs, err)
+		}
+	}
 
 	return errs
 }
@@ -315,6 +325,16 @@ func (Build) Cpp() error {
 			errs = errors.Join(errs, err)
 		}
 	}
+	for _, vr := range cppBuildVariantsArm64 {
+		if err := buildCpp(host, vr.src, vr.name, vr.flags...); err != nil {
+			errs = errors.Join(errs, err)
+		}
+	}
+	for _, vr := range cppBuildVariantsX86 {
+		if err := buildCpp(host, vr.src, vr.name, vr.flags...); err != nil {
+			errs = errors.Join(errs, err)
+		}
+	}
 
 	return errs
 }

src/basic-cpp-jit.cpp

@@ -155,7 +155,8 @@ int main() {
   unsigned long long jit2_last_addr = (unsigned long long)mem;
 
   // We are done writing code, let's not make it writable anymore.
-  mprotect(mem_start, jit_size, PROT_EXEC);
+  // Note: The 'PROT_READ' is necessary when compiling with Zig, else it segfaults.
+  mprotect(mem_start, jit_size, PROT_READ | PROT_EXEC);
 
   // Write perfmap so perf can symbolize the jitted functions.
   //