From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 29 Jul 2022 03:03:42 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5997ab6ecdbc6981a8a35b2349b3bd98c746a19;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_assert.h b/open-vm-tools/lib/include/vm_assert.h
index ad4405df3..d633af483 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -361,19 +361,12 @@ void WarningThrottled(uint32 *count, const char *fmt, ...) PRINTF_DECL(2, 3);
  * compiler is known to support it.
  */
 
-# if defined VMKPANIC
+# if defined VMKPANIC || defined VMM || defined ULM_ESX
 #  undef  NOT_REACHED
-#  if defined __GNUC__ && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#   define NOT_REACHED() (__builtin_unreachable())
-#  else
-#   define NOT_REACHED() ((void)0)
-#  endif
-# elif defined VMM || defined ULM_ESX
-#  undef  NOT_REACHED
-#  define NOT_REACHED() (__builtin_unreachable())
+#  define NOT_REACHED() __builtin_unreachable()
 # elif defined ULM_WIN
 #  undef  NOT_REACHED
-#  define NOT_REACHED() (__assume(0))
+#  define NOT_REACHED() __assume(0)
 # else
  // keep debug definition
 # endif