From 1f38e9aef71ae9e170a69e1f15b7c455a9627e99 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 31 Oct 2018 13:42:54 +0100 Subject: executor: fix inclusion of kvm arch-specific code We use GOOS now to figure out target arch (which can be different from host arch). --- pkg/csource/generated.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/csource') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index f35fdf979..d467fe621 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -1468,7 +1468,7 @@ error: #include #include -#if defined(__x86_64__) +#if GOARCH_amd64 const char kvm_asm16_cpl3[] = "\x0f\x20\xc0\x66\x83\xc8\x01\x0f\x22\xc0\xb8\xa0\x00\x0f\x00\xd8\xb8\x2b\x00\x8e\xd8\x8e\xc0\x8e\xe0\x8e\xe8\xbc\x00\x01\xc7\x06\x00\x01\x1d\xba\xc7\x06\x02\x01\x23\x00\xc7\x06\x04\x01\x00\x01\xc7\x06\x06\x01\x2b\x00\xcb"; const char kvm_asm32_paged[] = "\x0f\x20\xc0\x0d\x00\x00\x00\x80\x0f\x22\xc0"; const char kvm_asm32_vm86[] = "\x66\xb8\xb8\x00\x0f\x00\xd8\xea\x00\x00\x00\x00\xd0\x00"; @@ -2340,7 +2340,7 @@ static uintptr_t syz_kvm_setup_cpu(uintptr_t a0, uintptr_t a1, uintptr_t a2, uin return 0; } -#elif defined(__aarch64__) +#elif GOARCH_arm64 struct kvm_text { uintptr_t typ; -- cgit mrf-deployment