resolving conficts after merging

2025-11-17 09:45:28 +03:00 · 2021-11-13 18:58:22 +02:00
parent 6440d18b48 092e217e85
commit 2136580d50
31 changed files with 1283 additions and 322 deletions
--- a/unit/internal/simd_utils.cpp
+++ b/unit/internal/simd_utils.cpp
@@ -671,6 +671,7 @@ TEST(SimdUtilsTest, movq) {
 #elif defined(ARCH_PPC64EL)
    int64x2_t a = {0x123456789abcdefLL, ~0LL };
    simd = (m128) a;
+    simd = vreinterpretq_s32_s64(a);
 #endif
 #endif
    r = movq(simd);