From 896dff961918b8ad3556e838e219f1f0e3d1d514 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sat, 22 Feb 2025 06:43:28 +0100 Subject: [PATCH] src/check: some toolchains are buggy --- src/check/dt_check.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/check/dt_check.cpp b/src/check/dt_check.cpp index 11468180..86a3cc52 100644 --- a/src/check/dt_check.cpp +++ b/src/check/dt_check.cpp @@ -158,8 +158,8 @@ static_assert(8 * sizeof(int) == __INT_WIDTH__, ""); #if defined(__LONG_WIDTH__) static_assert(8 * sizeof(long) == __LONG_WIDTH__, ""); #endif -#if defined(__LONG_LONG_WIDTH__) -static_assert(8 * sizeof(long long) == __LONG_LONG_WIDTH__, ""); +#if defined(__LLONG_WIDTH__) +static_assert(8 * sizeof(long long) == __LLONG_WIDTH__, ""); #endif #if defined(__INTMAX_WIDTH__) static_assert(8 * sizeof(intmax_t) == __INTMAX_WIDTH__, ""); @@ -255,19 +255,6 @@ static_assert(std::is_unsigned::value, ""); ASSERT_SAME_TYPE(upx_ptraddr_t, expected_ptraddr_t); #endif -#if defined(__INTPTR_TYPE__) && defined(__UINTPTR_TYPE__) -#if defined(__m68k__) && defined(__atarist__) && defined(__GNUC__) -// BUG: compiler/mintlib mismatch: int vs long -#elif (defined(__arm__) || defined(__mips__)) && defined(__linux__) && defined(__clang__) && \ - (__SIZEOF_LONG__ == 4) -// BUG: compiler/libc mismatch: int vs long -// TODO later: check zig and clang for possible misconfiguration under 32-bit arm & mips -#else -ASSERT_SAME_TYPE(intptr_t, expected_intptr_t); -ASSERT_SAME_TYPE(uintptr_t, expected_uintptr_t); -#endif // BUG -#endif - // UPX types ASSERT_SAME_TYPE(signed char, upx_int8_t); ASSERT_SAME_TYPE(unsigned char, upx_uint8_t);