From 549674db4cf69ac516a56615c94f3687412fb574 Mon Sep 17 00:00:00 2001 From: wen Date: Sat, 7 Mar 2015 14:39:53 +0000 Subject: - Fix build on armv6 PR: 197795 Submitted by: mikael.urankar@gmail.com --- math/cln/Makefile | 8 +++++++- math/cln/files/patch-src_base_cl__low.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 math/cln/files/patch-src_base_cl__low.h (limited to 'math') diff --git a/math/cln/Makefile b/math/cln/Makefile index a124085a738d..09ea89a18f42 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -23,4 +23,10 @@ INFO= cln BROKEN_sparc64= Does not compile on sparc64 -.include +.include + +.if ${ARCH} == armv6 +CPPFLAGS+= -DNO_ASM +.endif + +.include diff --git a/math/cln/files/patch-src_base_cl__low.h b/math/cln/files/patch-src_base_cl__low.h new file mode 100644 index 000000000000..7177af422b36 --- /dev/null +++ b/math/cln/files/patch-src_base_cl__low.h @@ -0,0 +1,29 @@ +--- 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) \ -- cgit