Date: Fri, 29 Jun 2018 07:36:14 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473530 - in head/math/cln: . files Message-ID: <201806290736.w5T7aEDq077399@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Fri Jun 29 07:36:14 2018 New Revision: 473530 URL: https://svnweb.freebsd.org/changeset/ports/473530 Log: Fix build on aarch64. Tested for no-harm on amd64. PR: 229262 Submitted by: greg at unrelenting.technology Approved by: portmgr (tier-2 blanket) Added: head/math/cln/files/patch-src_base_low_cl__low__div.cc (contents, props changed) head/math/cln/files/patch-src_base_low_cl__low__mul.cc (contents, props changed) Modified: head/math/cln/Makefile Modified: head/math/cln/Makefile ============================================================================== --- head/math/cln/Makefile Fri Jun 29 07:31:24 2018 (r473529) +++ head/math/cln/Makefile Fri Jun 29 07:36:14 2018 (r473530) @@ -21,8 +21,6 @@ USE_LDCONFIG= yes INFO= cln -BROKEN_aarch64= Fails to compile: error: declaration of divu_64_rest in global scope conflicts with declaration with C language linkage - .include <bsd.port.pre.mk> .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 Added: head/math/cln/files/patch-src_base_low_cl__low__div.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cln/files/patch-src_base_low_cl__low__div.cc Fri Jun 29 07:36:14 2018 (r473530) @@ -0,0 +1,11 @@ +--- src/base/low/cl_low_div.cc.orig 2018-06-23 21:13:46 UTC ++++ src/base/low/cl_low_div.cc +@@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 + #endif + + #ifdef NEED_VAR_divu_64_rest +-uint64 divu_64_rest; ++extern "C" uint64 divu_64_rest; + #endif + + #ifdef NEED_FUNCTION_divu_6464_6464_ Added: head/math/cln/files/patch-src_base_low_cl__low__mul.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cln/files/patch-src_base_low_cl__low__mul.cc Fri Jun 29 07:36:14 2018 (r473530) @@ -0,0 +1,16 @@ +--- src/base/low/cl_low_mul.cc.orig 2018-06-23 21:15:19 UTC ++++ src/base/low/cl_low_mul.cc +@@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2) + + + #ifdef NEED_VAR_mulu64_high +-uint64 mulu64_high; ++extern "C" uint64 mulu64_high; + #endif + + #ifdef NEED_FUNCTION_mulu64_ +-uint64 mulu64_high; ++extern "C" uint64 mulu64_high; + namespace cln { + extern "C" uint64 mulu64_ (uint64 x, uint64 y); + uint64 mulu64_ (uint64 x, uint64 y)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806290736.w5T7aEDq077399>