From owner-svn-ports-all@freebsd.org Tue Feb 16 16:42:29 2021 Return-Path: Delivered-To: svn-ports-all@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 3C50A53F2F2; Tue, 16 Feb 2021 16:42:29 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dg6Fx1FY4z4htX; Tue, 16 Feb 2021 16:42:29 +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 1DC3614A20; Tue, 16 Feb 2021 16:42:29 +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 11GGgTX1055162; Tue, 16 Feb 2021 16:42:29 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11GGgSRf055161; Tue, 16 Feb 2021 16:42:28 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202102161642.11GGgSRf055161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 16 Feb 2021 16:42:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565415 - head/science/cdo/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/science/cdo/files X-SVN-Commit-Revision: 565415 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2021 16:42:29 -0000 Author: pkubaj Date: Tue Feb 16 16:42:28 2021 New Revision: 565415 URL: https://svnweb.freebsd.org/changeset/ports/565415 Log: science/cdo: fix build on powerpc64le, powerpc64 with CPUTYPE=power6 and newer with Clang Clang doesn't have __fsel function. Taken from https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/config/rs6000/ppu_intrinsics.h;h=e17faae05932e33c22697a3178b26314b88c9a31;hb=HEAD#l530 Added: head/science/cdo/files/patch-libcdi_src_cgribexlib.c (contents, props changed) Added: head/science/cdo/files/patch-libcdi_src_cgribexlib.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cdo/files/patch-libcdi_src_cgribexlib.c Tue Feb 16 16:42:28 2021 (r565415) @@ -0,0 +1,31 @@ +--- libcdi/src/cgribexlib.c.orig 2021-02-16 14:56:42 UTC ++++ libcdi/src/cgribexlib.c +@@ -10,7 +10,7 @@ + #pragma GCC diagnostic warning "-Wstrict-overflow" + #endif + +-#ifdef _ARCH_PWR6 ++#if defined(_ARCH_PWR6) && defined(__GLIBC__) + #pragma options nostrict + #include + #endif +@@ -726,6 +726,19 @@ void sse2_minmax_val_double(const double *restrict buf + #endif // SIMD + + #if defined(_ARCH_PWR6) ++ ++#ifndef __fsel ++static __inline__ double __fsel(double x, double y, double z) ++ __attribute__((always_inline)); ++static __inline__ double ++__fsel(double x, double y, double z) ++{ ++ double r; ++ __asm__("fsel %0,%1,%2,%3" : "=d"(r) : "d"(x),"d"(y),"d"(z)); ++ return r; ++} ++#endif ++ + static + void pwr6_minmax_val_double_unrolled6(const double *restrict data, size_t datasize, double *fmin, double *fmax) + {