From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 4 Mar 2020 20:07:12 +0000 (-0800)
Subject: Arm64 backdoor: Disable USE_HYPERCALL for Arm64 tools build.
X-Git-Tag: stable-11.1.0~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e10ecfb138f43e225be1830ca4d3558f5749aa6;p=thirdparty%2Fopen-vm-tools.git

Arm64 backdoor: Disable USE_HYPERCALL for Arm64 tools build.

Undefine USE_HYPERCALL on ESXi-Arm to force the backdoor interface type
to BACKDOOR_INTERFACE_IO.  This is necessary to fix the Arm64 tools build.
This change does not affect x86 (open-vm-tools).
---

diff --git a/open-vm-tools/lib/backdoor/backdoorInt.h b/open-vm-tools/lib/backdoor/backdoorInt.h
index 3f9618750..acd682a04 100644
--- a/open-vm-tools/lib/backdoor/backdoorInt.h
+++ b/open-vm-tools/lib/backdoor/backdoorInt.h
@@ -48,7 +48,7 @@ void BackdoorHb(Backdoor_proto_hb *myBp, Bool outbound);
 #define GCC_VERSION (__GNUC__ * 10000 + \
                      __GNUC_MINOR__ * 100 + \
                      __GNUC_PATCHLEVEL__)
-#if GCC_VERSION > 40803
+#if GCC_VERSION > 40803 && !defined(__aarch64__)
 #define USE_HYPERCALL
 #endif
 #endif
diff --git a/open-vm-tools/lib/misc/hostinfoHV.c b/open-vm-tools/lib/misc/hostinfoHV.c
index a906f20e7..5606df12d 100644
--- a/open-vm-tools/lib/misc/hostinfoHV.c
+++ b/open-vm-tools/lib/misc/hostinfoHV.c
@@ -49,7 +49,7 @@
 #define GCC_VERSION (__GNUC__ * 10000 + \
                      __GNUC_MINOR__ * 100 + \
                      __GNUC_PATCHLEVEL__)
-#if GCC_VERSION > 40803
+#if GCC_VERSION > 40803 && !defined(__aarch64__)
 #define USE_HYPERCALL
 #endif
 #endif