From owner-svn-ports-head@freebsd.org Sun Nov 17 19:01:59 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F47B1C74B3; Sun, 17 Nov 2019 19:01:59 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47GLzp6hXGz4XVY; Sun, 17 Nov 2019 19:01:58 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA3051E3C4; Sun, 17 Nov 2019 19:01:58 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAHJ1wMg012610; Sun, 17 Nov 2019 19:01:58 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAHJ1wB4012597; Sun, 17 Nov 2019 19:01:58 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201911171901.xAHJ1wB4012597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 17 Nov 2019 19:01:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517837 - head/astro/oskar/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/astro/oskar/files X-SVN-Commit-Revision: 517837 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Nov 2019 19:01:59 -0000 Author: pkubaj Date: Sun Nov 17 19:01:58 2019 New Revision: 517837 URL: https://svnweb.freebsd.org/changeset/ports/517837 Log: 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 Added: head/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h (contents, props changed) Added: head/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/oskar/files/patch-extern_Random123_features_gccfeatures.h Sun Nov 17 19:01:58 2019 (r517837) @@ -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