|
 |
c55b40 |
From 480b65cae6c20a41aa698a6c9d3b260f6f744004 Mon Sep 17 00:00:00 2001
|
|
|
c55b40 |
From: Ilya Leoshkevich <iii@linux.ibm.com>
|
|
|
c55b40 |
Date: Thu, 2 Feb 2023 19:41:32 +0100
|
|
|
c55b40 |
Subject: [PATCH] 0003-PATCH-Fix-clang-s-behavior-on-versions-7.patch
|
|
|
c55b40 |
|
|
|
c55b40 |
---
|
|
|
c55b40 |
contrib/power/clang_workaround.h | 15 ++++++++++-----
|
|
|
c55b40 |
1 file changed, 10 insertions(+), 5 deletions(-)
|
|
|
c55b40 |
|
|
|
c55b40 |
diff --git a/contrib/power/clang_workaround.h b/contrib/power/clang_workaround.h
|
|
|
c55b40 |
index b5e7dae..915f7e5 100644
|
|
|
c55b40 |
--- a/contrib/power/clang_workaround.h
|
|
|
c55b40 |
+++ b/contrib/power/clang_workaround.h
|
|
|
c55b40 |
@@ -39,7 +39,12 @@ __vector unsigned long long __builtin_pack_vector (unsigned long __a,
|
|
|
c55b40 |
return __v;
|
|
|
c55b40 |
}
|
|
|
c55b40 |
|
|
|
c55b40 |
-#ifndef vec_xxpermdi
|
|
|
c55b40 |
+/*
|
|
|
c55b40 |
+ * Clang 7 changed the behavior of vec_xxpermdi in order to provide the same
|
|
|
c55b40 |
+ * behavior of GCC. That means code adapted to Clang >= 7 does not work on
|
|
|
c55b40 |
+ * Clang <= 6. So, fallback to __builtin_unpack_vector() on Clang <= 6.
|
|
|
c55b40 |
+ */
|
|
|
c55b40 |
+#if !defined vec_xxpermdi || __clang_major__ <= 6
|
|
|
c55b40 |
|
|
|
c55b40 |
static inline
|
|
|
c55b40 |
unsigned long __builtin_unpack_vector (__vector unsigned long long __v,
|
|
|
c55b40 |
@@ -62,9 +67,9 @@ static inline
|
|
|
c55b40 |
unsigned long __builtin_unpack_vector_0 (__vector unsigned long long __v)
|
|
|
c55b40 |
{
|
|
|
c55b40 |
#if defined(__BIG_ENDIAN__)
|
|
|
c55b40 |
- return vec_xxpermdi(__v, __v, 0x0)[1];
|
|
|
c55b40 |
- #else
|
|
|
c55b40 |
return vec_xxpermdi(__v, __v, 0x0)[0];
|
|
|
c55b40 |
+ #else
|
|
|
c55b40 |
+ return vec_xxpermdi(__v, __v, 0x3)[0];
|
|
|
c55b40 |
#endif
|
|
|
c55b40 |
}
|
|
|
c55b40 |
|
|
|
c55b40 |
@@ -72,9 +77,9 @@ static inline
|
|
|
c55b40 |
unsigned long __builtin_unpack_vector_1 (__vector unsigned long long __v)
|
|
|
c55b40 |
{
|
|
|
c55b40 |
#if defined(__BIG_ENDIAN__)
|
|
|
c55b40 |
- return vec_xxpermdi(__v, __v, 0x3)[1];
|
|
|
c55b40 |
- #else
|
|
|
c55b40 |
return vec_xxpermdi(__v, __v, 0x3)[0];
|
|
|
c55b40 |
+ #else
|
|
|
c55b40 |
+ return vec_xxpermdi(__v, __v, 0x0)[0];
|
|
|
c55b40 |
#endif
|
|
|
c55b40 |
}
|
|
|
c55b40 |
#endif /* vec_xxpermdi */
|
|
|
c55b40 |
--
|
|
|
c55b40 |
2.39.1
|
|
|
c55b40 |
|