From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 7 Sep 2021 13:39:53 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b963fdd5363d1ecd347045408cf1b40e5ac27188;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 4972a6486..d2f527a18 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -98,6 +98,29 @@
 #  error Unexpected: defined __arm64__ without __aarch64__
 #endif
 
+#ifdef GTEST
+
+// Select definitions based on product.
+#if defined(GTEST_PRODUCT_esx)
+#define vm_arm_64 0
+#define vm_x86_64 1
+
+#define VM_X86_64
+#define VM_X86_ANY
+#define VM_64BIT
+#elif defined(GTEST_PRODUCT_esxarm64)
+#define vm_arm_64 1
+#define vm_x86_64 0
+
+#define VM_ARM_64
+#define VM_ARM_ANY
+#define VM_64BIT
+#else
+#error "Unknown gtest product, cannot define ISA."
+#endif
+
+#else    // !GTEST
+
 /*
  * Setup a bunch of defines for instruction set architecture (ISA) related
  * properties.
@@ -146,6 +169,8 @@
 #define vm_arm_64 0
 #endif
 
+#endif   // !GTEST
+
 #ifdef VM_ARM_ANY
 #define vm_arm_any 1
 #else