diff --git a/include/fmt/core.h b/include/fmt/core.h index 9ddf94a5..1e8ecad1 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -49,12 +49,6 @@ # define FMT_ICC_VERSION 0 #endif -#ifdef __ibmxl__ -# define FMT_XLC_VERSION __ibmxl_vrm__ -#else -# define FMT_XLC_VERSION 0 -#endif - #ifdef _MSC_VER # define FMT_MSC_VERSION _MSC_VER # define FMT_MSC_WARNING(...) __pragma(warning(__VA_ARGS__)) diff --git a/include/fmt/format.h b/include/fmt/format.h index 30ac38e4..f9bfd955 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -391,14 +391,11 @@ class uint128_fallback { hi_ += (lo_ < n ? 1 : 0); return *this; } -#if FMT_XLC_VERSION && defined(_ARCH_PWR9) - lo_ = __addex(lo_, n, 0, &carry); - hi_ += carry; -#elif FMT_HAS_BUILTIN(__builtin_addcll) && !FMT_XLC_VERSION +#if FMT_HAS_BUILTIN(__builtin_addcll) && !defined(__ibmxl__) unsigned long long carry; lo_ = __builtin_addcll(lo_, n, 0, &carry); hi_ += carry; -#elif FMT_HAS_BUILTIN(__builtin_ia32_addcarryx_u64) && !FMT_XLC_VERSION +#elif FMT_HAS_BUILTIN(__builtin_ia32_addcarryx_u64) && !defined(__ibmxl__) unsigned long long result; auto carry = __builtin_ia32_addcarryx_u64(0, lo_, n, &result); lo_ = result;