From owner-svn-ports-head@FreeBSD.ORG Tue May 12 21:00:55 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EFCD8BF; Tue, 12 May 2015 21:00:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D23291628; Tue, 12 May 2015 21:00:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CL0sUs090540; Tue, 12 May 2015 21:00:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CL0sO3090539; Tue, 12 May 2015 21:00:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505122100.t4CL0sO3090539@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 12 May 2015 21:00:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386173 - head/devel/nspr/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2015 21:00:55 -0000 Author: jbeich Date: Tue May 12 21:00:53 2015 New Revision: 386173 URL: https://svnweb.freebsd.org/changeset/ports/386173 Log: devel/nspr: fix up mips64 and mips*el support This syncs the patch with what landed upstream. PR: 197577 Modified: head/devel/nspr/files/patch-bug1163346 Modified: head/devel/nspr/files/patch-bug1163346 ============================================================================== --- head/devel/nspr/files/patch-bug1163346 Tue May 12 20:26:13 2015 (r386172) +++ head/devel/nspr/files/patch-bug1163346 Tue May 12 21:00:53 2015 (r386173) @@ -1,98 +1,109 @@ --- ../pr/include/md/_freebsd.cfg.orig 2015-01-22 20:44:59 UTC +++ ../pr/include/md/_freebsd.cfg -@@ -392,6 +392,97 @@ +@@ -392,6 +392,108 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 -+#elif defined(__mips__) ++#elif defined(__mips64__) + ++#if defined(__MIPSEB__) || defined(_MIPSEB) +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 ++#else ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#endif ++ ++#define IS_64 + +#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_LONG 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_WORD 8 +#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_LONG 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 ++#define PR_BITS_PER_WORD 64 + +#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_LONG_LOG2 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 ++#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_LONG 8 +#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_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 + -+#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + -+#elif defined(__mips64__) ++#elif defined(__mips__) + ++#if defined(__MIPSEB__) || defined(_MIPSEB) +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 -+#define IS_64 ++#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 8 ++#define PR_BYTES_PER_LONG 4 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 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 64 ++#define PR_BITS_PER_LONG 32 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 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 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 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 8 ++#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 8 -+#define PR_ALIGN_OF_WORD 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 + -+#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_WORD_LOG2 2 +#define PR_BYTES_PER_DWORD_LOG2 3 + #else @@ -104,10 +115,10 @@ #define _PR_SI_ARCHITECTURE "powerpc" #elif defined(__arm__) #define _PR_SI_ARCHITECTURE "arm" -+#elif defined(__mips__) -+#define _PR_SI_ARCHITECTURE "mips" +#elif defined(__mips64__) +#define _PR_SI_ARCHITECTURE "mips64" ++#elif defined(__mips__) ++#define _PR_SI_ARCHITECTURE "mips" #else #error "Unknown CPU architecture" #endif