From 043c1e4a696b064512b115050575cc4af4c10c7f Mon Sep 17 00:00:00 2001
From: Federico Busato <fbusato@nvidia.com>
Date: Tue, 19 Jul 2022 11:04:32 -0700
Subject: [PATCH] Replace legacy xlc with clang-based xlc

---
 include/fmt/core.h   | 10 ++--------
 include/fmt/format.h |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/include/fmt/core.h b/include/fmt/core.h
index fbde339f..9ddf94a5 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -49,14 +49,8 @@
 #  define FMT_ICC_VERSION 0
 #endif
 
-#ifdef __xlC_ver__
-#  define FMT_XLC_VERSION __xlC_ver__
-#elif defined(__xlC__)
-#  define FMT_XLC_VERSION __xlC__
-#elif defined(__IBMC__)
-#  define FMT_XLC_VERSION __IBMC__
-#elif defined(__IBMCPP__)
-#  define FMT_XLC_VERSION __IBMCPP__
+#ifdef __ibmxl__
+#  define FMT_XLC_VERSION __ibmxl_vrm__
 #else
 #  define FMT_XLC_VERSION 0
 #endif
diff --git a/include/fmt/format.h b/include/fmt/format.h
index d6bf02ee..30ac38e4 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -391,7 +391,7 @@ class uint128_fallback {
       hi_ += (lo_ < n ? 1 : 0);
       return *this;
     }
-#if FMT_XLC_VERSION && defined(_ARCH_PWR9) && defined(_ARCH_PPC64)
+#if FMT_XLC_VERSION && defined(_ARCH_PWR9)
     lo_ = __addex(lo_, n, 0, &carry);
     hi_ += carry;
 #elif FMT_HAS_BUILTIN(__builtin_addcll) && !FMT_XLC_VERSION