Date: Sun, 24 Aug 2014 06:17:38 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1665 - in trunk/devel/nspr: . files Message-ID: <201408240617.s7O6HcFB073532@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Aug 24 06:17:38 2014
New Revision: 1665
Log:
Add ARM support for devel/nspr
PR: ports/192773
Submitted by: sbruno
Modified:
trunk/devel/nspr/Makefile
trunk/devel/nspr/files/patch-bug782113
Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile Sat Aug 23 19:24:44 2014 (r1664)
+++ trunk/devel/nspr/Makefile Sun Aug 24 06:17:38 2014 (r1665)
@@ -25,10 +25,6 @@
.include <bsd.port.pre.mk>
-.if ${ARCH} == "arm"
-BROKEN= Does not compile on arm
-.endif
-
.if !defined(WITH_DEBUG)
CONFIGURE_ARGS+=--disable-debug
.endif
Modified: trunk/devel/nspr/files/patch-bug782113
==============================================================================
--- trunk/devel/nspr/files/patch-bug782113 Sat Aug 23 19:24:44 2014 (r1664)
+++ trunk/devel/nspr/files/patch-bug782113 Sun Aug 24 06:17:38 2014 (r1665)
@@ -1,6 +1,6 @@
--- ../pr/include/md/_freebsd.cfg
+++ ../pr/include/md/_freebsd.cfg
-@@ -251,6 +251,97 @@
+@@ -251,6 +251,147 @@
#define PR_ALIGN_OF_POINTER 8
#define PR_ALIGN_OF_WORD 8
@@ -95,12 +95,62 @@
+#define PR_BYTES_PER_WORD_LOG2 2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
++#elif defined(__arm__)
++
++#if defined(__ARMEB__) || defined(__ARM_BIG_ENDIAN__)
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#else
++#undef IS_BIG_ENDIAN
++#define IS_LITTLE_ENDIAN 1
++#endif
++
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#define PR_BITS_PER_BYTE_LOG2 3
++#define PR_BITS_PER_SHORT_LOG2 4
++#define PR_BITS_PER_INT_LOG2 5
++#define PR_BITS_PER_INT64_LOG2 6
++#define PR_BITS_PER_LONG_LOG2 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
#else
#error "Unknown CPU architecture"
--- ../pr/include/md/_freebsd.h
+++ ../pr/include/md/_freebsd.h
-@@ -25,6 +25,10 @@
+@@ -25,6 +25,12 @@
#define _PR_SI_ARCHITECTURE "ia64"
#elif defined(__amd64__)
#define _PR_SI_ARCHITECTURE "amd64"
@@ -108,6 +158,8 @@
+#define _PR_SI_ARCHITECTURE "powerpc64"
+#elif defined(__powerpc__)
+#define _PR_SI_ARCHITECTURE "powerpc"
++#elif defined(__arm__)
++#define _PR_SI_ARCHITECTURE "arm"
#else
#error "Unknown CPU architecture"
#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408240617.s7O6HcFB073532>