kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Unbreak on aarch64

Browse source 
PR:		237439
Submitted by:	greg@unrelenting.technology
This commit is contained in:
Wen Heping 2019-04-23 23:44:25 +00:00
parent 7089774bad
commit 314a368dbc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=499801
4 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
math/cln/Makefile
View file

@ -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

29
math/cln/files/extra-patch-src_base_cl__low.h
View file

@ -1,29 +0,0 @@
--- src/base/cl_low.h.orig 2015-01-28 09:25:18 UTC
+++ src/base/cl_low.h
@@ -207,7 +207,7 @@ inline uint32 mulu32_unchecked (uint32 a
// declared inside a namespace!
} extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil
#else
- extern "C" uint32 mulu32_high; // -> High-Teil
+} extern "C" uint32 mulu32_high; namespace cln { // -> High-Teil
#endif
#if defined(__GNUC__) && defined(__m68k__) && !defined(NO_ASM)
#define mulu32(x,y,hi_zuweisung,lo_zuweisung) \
@@ -439,7 +439,7 @@ inline uint32 mulu32_unchecked (uint32 a
// Workaround MSVC compiler bug.
} extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r
#else
- extern "C" uint16 divu_16_rest; // -> Rest r
+} extern "C" uint16 divu_16_rest; namespace cln { // -> Rest r
#endif
#endif
#if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
@@ -589,7 +589,7 @@ inline uint32 mulu32_unchecked (uint32 a
// Workaround MSVC compiler bug.
} extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r
#else
- extern "C" uint32 divu_32_rest; // -> Rest r
+} extern "C" uint32 divu_32_rest; namespace cln { // -> Rest r
#endif
#if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
#define divu_3232_3232(x,y,q_zuweisung,r_zuweisung) \

4
math/cln/files/extra-patch-src_base_low_cl__low__div.cc
View file

@ -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_

4
math/cln/files/extra-patch-src_base_low_cl__low__mul.cc
View file

@ -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)