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

[Wen Heping]

Author: wen
Date: Sat Mar  7 14:39:53 2015
New Revision: 380699
URL: https://svnweb.freebsd.org/changeset/ports/380699
QAT: https://qat.redports.org/buildarchive/r380699/

Log:
  - Fix build on armv6
  
  PR:		197795
  Submitted by:	mikael.urankar at gmail.com

Added:
  head/math/cln/files/patch-src_base_cl__low.h   (contents, props changed)
Modified:
  head/math/cln/Makefile

Modified: head/math/cln/Makefile
==============================================================================
--- head/math/cln/Makefile	Sat Mar  7 13:53:53 2015	(r380698)
+++ head/math/cln/Makefile	Sat Mar  7 14:39:53 2015	(r380699)
@@ -23,4 +23,10 @@ INFO=		cln
 
 BROKEN_sparc64=	Does not compile on sparc64
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == armv6
+CPPFLAGS+=	-DNO_ASM
+.endif
+
+.include <bsd.port.post.mk>

Added: head/math/cln/files/patch-src_base_cl__low.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/cln/files/patch-src_base_cl__low.h	Sat Mar  7 14:39:53 2015	(r380699)
@@ -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)  \