diff options
| -rw-r--r-- | executor/common_linux.h | 7 | ||||
| -rw-r--r-- | pkg/csource/csource.go | 7 | ||||
| -rw-r--r-- | pkg/csource/generated.go | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index cb60ca9de..8e816fb8e 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -3528,3 +3528,10 @@ static void setup_usb() fail("failed to chmod /dev/raw-gadget"); } #endif + +#if GOARCH_s390x +#include <sys/mman.h> +// Ugly way to work around gcc's "error: function called through a non-compatible type". +// The macro is used in generated C code. +#define CAST(f) ({void* p = (void*)f; p; }) +#endif diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go index 8818e4f1c..2799920e3 100644 --- a/pkg/csource/csource.go +++ b/pkg/csource/csource.go @@ -265,13 +265,14 @@ func (ctx *context) emitCall(w *bytes.Buffer, call prog.ExecCall, ci int, haveCo } func (ctx *context) emitCallName(w *bytes.Buffer, call prog.ExecCall, native bool) { - callName := call.Meta.CallName + callName, ok := ctx.sysTarget.SyscallTrampolines[call.Meta.CallName] + if !ok { + callName = call.Meta.CallName + } if native { fmt.Fprintf(w, "syscall(%v%v", ctx.sysTarget.SyscallPrefix, callName) } else if strings.HasPrefix(callName, "syz_") { fmt.Fprintf(w, "%v(", callName) - } else if trampolineName, ok := ctx.sysTarget.SyscallTrampolines[callName]; ok { - fmt.Fprintf(w, "%v(", trampolineName) } else { args := strings.Repeat(",intptr_t", len(call.Args)) if args != "" { diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index e374b593f..b84dfec91 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -8376,6 +8376,11 @@ static void setup_usb() } #endif +#if GOARCH_s390x +#include <sys/mman.h> +#define CAST(f) ({void* p = (void*)f; p; }) +#endif + #elif GOOS_test #include <stdlib.h> |