Attachment #209526 for bug #242296

View | Details | Raw Unified | Return to bug 242296
Collapse All | Expand All

Lines 22-33 Link Here

(-)Makefile (-8 / +4 lines)
22		22
23	INFO= cln	23	INFO= cln
24		24
25	.include <bsd.port.pre.mk>	25	CPPFLAGS_aarch64= -DNO_ASM
		26	CPPFLAGS_armv6= -DNO_ASM
		27	CPPFLAGS_armv7= -DNO_ASM
26		28
27	.if ${ARCH} == aarch64 \|\| ${ARCH} == armv6 \|\| ${ARCH} == armv7	29	.include <bsd.port.mk>
28	CPPFLAGS+= -DNO_ASM
29	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \
30	${PATCHDIR}/extra-patch-src_base_low_cl__low__mul.cc
31	.endif
32
33	.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)files/extra-patch-src_base_low_cl__low__div.cc (-11 lines)
1	--- src/base/low/cl_low_div.cc.orig 2011-04-08 21:07:28 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 = 0;
9	#endif
10
11	#ifdef NEED_FUNCTION_divu_6464_6464_




--- 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)
 
 
 #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 = 0;
 namespace cln {
 extern "C" uint64 mulu64_ (uint64 x, uint64 y);
 uint64 mulu64_ (uint64 x, uint64 y)

Return to bug 242296

Lines 1-16 Link Here

(-)files/extra-patch-src_base_low_cl__low__mul.cc (-16 lines)
1	--- src/base/low/cl_low_mul.cc.orig 2011-04-08 21:06:30 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 = 0;
14	namespace cln {
15	extern "C" uint64 mulu64_ (uint64 x, uint64 y);
16	uint64 mulu64_ (uint64 x, uint64 y)