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 3f96187501bb68ef21dc1ff2ca78cd7aba06f417..acd682a040d007655feb8d8ff026a1a78b1a1700 100644 (file)
--- 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 a906f20e72c85566985420d55c6cecf9fba3d002..5606df12d1d911129b9be10bbad2e6e06a51c466 100644 (file)
--- 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