From 271db6fe4a5029fc3102d92cbc51b4426699425d Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Sun, 17 Nov 2019 19:01:58 +0000 Subject: astro/oskar: fix build on powerpc* with clang There are some Clang-on-PPC-specific issues. Clang doesn't have ppu_intrinsics.h. mulhdu and mulhwu are required. PR: 242016 Approved by: yuri (maintainer), linimon (mentor) Differential Revision: https://reviews.freebsd.org/D22424 --- .../patch-extern_Random123_features_gccfeatures.h | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 astro/oskar/files/patch-extern_Random123_features_gccfeatures.h (limited to 'astro/oskar/files/patch-extern_Random123_features_gccfeatures.h') diff --git a/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h b/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h new file mode 100644 index 000000000000..d7eb4af213fc --- /dev/null +++ b/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h @@ -0,0 +1,32 @@ +--- extern/Random123/features/gccfeatures.h.orig 2019-11-17 00:45:21 UTC ++++ extern/Random123/features/gccfeatures.h +@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O + Please let the authors know of any successes (or failures). */ + #endif + +-#ifdef __powerpc__ ++#if defined(__powerpc__) && !defined(__clang__) + #include + #endif + +@@ -246,6 +246,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O + #else + #define R123_USE_MULHILO64_MULHI_INTRIN 0 + #endif ++#endif ++ ++#if defined(__powerpc__) && defined(__clang__) ++#ifdef __powerpc64__ ++static inline unsigned long long __mulhdu(unsigned long long a, unsigned long long b) { ++ __uint128_t c = (__uint128_t) a * (__uint128_t) b; ++ return c >> 64; ++} ++#endif ++ ++static inline unsigned int __mulhwu(unsigned int a, unsigned int b) { ++ unsigned long long c = (unsigned long long) a * (unsigned long long) b; ++ return c >> 32; ++} + #endif + + #ifndef R123_MULHILO64_MULHI_INTRIN -- cgit v1.2.3