svn commit: r499801 - in head/math/cln: . files

[Wen Heping]

Author: wen
Date: Tue Apr 23 23:44:25 2019
New Revision: 499801
URL: https://svnweb.freebsd.org/changeset/ports/499801

Log:
  - Unbreak on aarch64
  
  PR:		237439
  Submitted by:	greg at unrelenting.technology

Deleted:
  head/math/cln/files/extra-patch-src_base_cl__low.h
Modified:
  head/math/cln/Makefile
  head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc
  head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc

Modified: head/math/cln/Makefile
==============================================================================
--- head/math/cln/Makefile	Tue Apr 23 21:57:57 2019	(r499800)
+++ head/math/cln/Makefile	Tue Apr 23 23:44:25 2019	(r499801)
@@ -26,8 +26,7 @@ INFO=		cln
 
 .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 CPPFLAGS+=	-DNO_ASM
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_base_cl__low.h \
-		${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \
 		${PATCHDIR}/extra-patch-src_base_low_cl__low__mul.cc
 .endif
 

Modified: head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc
==============================================================================
--- head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc	Tue Apr 23 21:57:57 2019	(r499800)
+++ head/math/cln/files/extra-patch-src_base_low_cl__low__div.cc	Tue Apr 23 23:44:25 2019	(r499801)
@@ -1,11 +1,11 @@
---- src/base/low/cl_low_div.cc.orig	2018-06-23 21:13:46 UTC
+--- src/base/low/cl_low_div.cc.orig	2011-04-08 21:07:28 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;
++extern "C" uint64 divu_64_rest = 0;
  #endif
  
  #ifdef NEED_FUNCTION_divu_6464_6464_

Modified: head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc
==============================================================================
--- head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc	Tue Apr 23 21:57:57 2019	(r499800)
+++ head/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc	Tue Apr 23 23:44:25 2019	(r499801)
@@ -1,4 +1,4 @@
---- src/base/low/cl_low_mul.cc.orig	2018-06-23 21:15:19 UTC
+--- src/base/low/cl_low_mul.cc.orig	2011-04-08 21:06:30 UTC
 +++ src/base/low/cl_low_mul.cc
 @@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2)
  
@@ -10,7 +10,7 @@
  
  #ifdef NEED_FUNCTION_mulu64_
 -uint64 mulu64_high;
-+extern "C" uint64 mulu64_high;
++extern "C" uint64 mulu64_high = 0;
  namespace cln {
  extern "C" uint64 mulu64_ (uint64 x, uint64 y);
  uint64 mulu64_ (uint64 x, uint64 y)