View | Details | Raw Unified | Return to bug 229262 | Differences between
and this patch

Collapse All | Expand All

(-)i/math/cln/Makefile (-2 lines)
Lines 21-28 USE_LDCONFIG= yes Link Here
21
21
22
INFO=		cln
22
INFO=		cln
23
23
24
BROKEN_aarch64=	Fails to compile: error: declaration of divu_64_rest in global scope conflicts with declaration with C language linkage
25
26
.include <bsd.port.pre.mk>
24
.include <bsd.port.pre.mk>
27
25
28
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
26
.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
(-)i/math/cln/files/patch-src_base_low_cl__low__div.cc (+11 lines)
Added Link Here
1
--- src/base/low/cl_low_div.cc.orig	2018-06-23 21:13:46 UTC
2
+++ src/base/low/cl_low_div.cc
3
@@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 
4
 #endif
5
 
6
 #ifdef NEED_VAR_divu_64_rest
7
-uint64 divu_64_rest;
8
+extern "C" uint64 divu_64_rest;
9
 #endif
10
 
11
 #ifdef NEED_FUNCTION_divu_6464_6464_
(-)i/math/cln/files/patch-src_base_low_cl__low__mul.cc (+16 lines)
Added Link Here
1
--- src/base/low/cl_low_mul.cc.orig	2018-06-23 21:15:19 UTC
2
+++ src/base/low/cl_low_mul.cc
3
@@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2)
4
 
5
 
6
 #ifdef NEED_VAR_mulu64_high
7
-uint64 mulu64_high;
8
+extern "C" uint64 mulu64_high;
9
 #endif
10
 
11
 #ifdef NEED_FUNCTION_mulu64_
12
-uint64 mulu64_high;
13
+extern "C" uint64 mulu64_high;
14
 namespace cln {
15
 extern "C" uint64 mulu64_ (uint64 x, uint64 y);
16
 uint64 mulu64_ (uint64 x, uint64 y)

Return to bug 229262