From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:20 +0000 (-0700)
Subject: Change to shared header file unrelated to open-vm-tools.
X-Git-Tag: stable-10.2.0~392
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5eadbaf0b029c4ba7b60ae2f06e80dc9a2f3346f;p=thirdparty%2Fopen-vm-tools.git

Change to shared header file unrelated to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index ba40d8b74..82c98ccb7 100644
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -246,8 +246,8 @@ typedef struct  Atomic_uint64 {
    volatile uint64 value;
 } Atomic_uint64 ALIGNED(8);
 
-#if (__GNUC__ > 4 || (__GNUC__ ==  4 && __GNUC_MINOR__ >= 6)) && \
-                                (defined(VM_X86_64) || defined(VM_ARM_64))
+#if defined(__GNUC__) && defined(VM_64BIT) && \
+     (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 || defined(VM_ARM_64))
 typedef struct Atomic_uint128 {
    volatile __int128 value;
 } Atomic_uint128 ALIGNED(16);
@@ -481,7 +481,7 @@ CMPXCHG1B(volatile uint8 *ptr, // IN/OUT
  *
  *-----------------------------------------------------------------------------
  */
-#if defined(__GNUC__) && \
+#if defined(__GNUC__) && defined(VM_64BIT) && \
      (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 || defined(VM_ARM_64))
 static INLINE __int128
 Atomic_ReadIfEqualWrite128(Atomic_uint128 *ptr,   // IN/OUT