From 1f38e9aef71ae9e170a69e1f15b7c455a9627e99 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
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).
---
 executor/common_linux.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'executor')

diff --git a/executor/common_linux.h b/executor/common_linux.h
index 2e6b33bcb..00c78c6af 100644
--- a/executor/common_linux.h
+++ b/executor/common_linux.h
@@ -868,9 +868,9 @@ error:
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#if defined(__x86_64__)
+#if GOARCH_amd64
 #include "common_kvm_amd64.h"
-#elif defined(__aarch64__)
+#elif GOARCH_arm64
 #include "common_kvm_arm64.h"
 #else
 static long syz_kvm_setup_cpu(long a0, long a1, long a2, long a3, long a4, long a5, long a6, long a7)
-- 
cgit mrf-deployment