From owner-svn-ports-head@freebsd.org Thu Mar 29 04:04:22 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FA4FF720FA; Thu, 29 Mar 2018 04:04:22 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 55100780BC; Thu, 29 Mar 2018 04:04:22 +0000 (UTC) (envelope-from linimon@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 4F47F14BA4; Thu, 29 Mar 2018 04:04:22 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2T44MsI013843; Thu, 29 Mar 2018 04:04:22 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2T44Mjb013840; Thu, 29 Mar 2018 04:04:22 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201803290404.w2T44Mjb013840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Thu, 29 Mar 2018 04:04:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465863 - head/math/openblas/files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/math/openblas/files X-SVN-Commit-Revision: 465863 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.25 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: Thu, 29 Mar 2018 04:04:22 -0000 Author: linimon Date: Thu Mar 29 04:04:21 2018 New Revision: 465863 URL: https://svnweb.freebsd.org/changeset/ports/465863 Log: Patch to fix build on armvX. Tested for no-harm on amd64. PR: 225693 Submitted by: mikael.urankar Approved by: maintainer timeout (> 2 weeks) Modified: head/math/openblas/files/patch-common__arm.h head/math/openblas/files/patch-cpuid__arm.c Modified: head/math/openblas/files/patch-common__arm.h ============================================================================== --- head/math/openblas/files/patch-common__arm.h Thu Mar 29 03:37:40 2018 (r465862) +++ head/math/openblas/files/patch-common__arm.h Thu Mar 29 04:04:21 2018 (r465863) @@ -1,6 +1,6 @@ --- common_arm.h.orig 2016-09-01 03:58:42 UTC +++ common_arm.h -@@ -93,6 +93,13 @@ static inline int blas_quickdivide(blasi +@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint #endif @@ -10,6 +10,10 @@ +#define fnmacd vmls.f64 +#define fnmuls vnmul.f32 +#define fnmuld vnmul.f64 ++#define fldmias vldmia ++#define fstmias vstmia ++#define fldmiad vldmia ++#define fstmiad vstmia +#endif #ifndef F_INTERFACE Modified: head/math/openblas/files/patch-cpuid__arm.c ============================================================================== --- head/math/openblas/files/patch-cpuid__arm.c Thu Mar 29 03:37:40 2018 (r465862) +++ head/math/openblas/files/patch-cpuid__arm.c Thu Mar 29 04:04:21 2018 (r465863) @@ -1,12 +1,16 @@ --- cpuid_arm.c.orig 2016-09-01 03:58:42 UTC +++ cpuid_arm.c -@@ -181,7 +181,8 @@ int detect(void) +@@ -181,7 +181,12 @@ int detect(void) } } - +#else ++#if (__ARM_ARCH == 7) ++ return CPU_ARMV7; ++#else + return CPU_ARMV6; ++#endif #endif return CPU_UNKNOWN;