Date: Sun, 12 Aug 2012 13:40:46 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r926 - branches/experimental/devel/nspr/files Message-ID: <201208121340.q7CDekAI073875@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Aug 12 13:40:46 2012
New Revision: 926
Log:
rename a few more files
Added:
branches/experimental/devel/nspr/files/patch-bug301986
- copied, changed from r925, branches/experimental/devel/nspr/files/patch-pthread_t
branches/experimental/devel/nspr/files/patch-bug782113
- copied, changed from r925, branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
Deleted:
branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h
branches/experimental/devel/nspr/files/patch-pthread_t
Deleted: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg
==============================================================================
--- branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg Sun Aug 12 13:40:46 2012 (r925)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,100 +0,0 @@
---- ../pr/include/md/_freebsd.cfg.orig 2007-11-26 19:17:17.000000000 +0100
-+++ ../pr/include/md/_freebsd.cfg 2010-06-09 20:30:03.000000000 +0200
-@@ -283,6 +283,97 @@
- #define PR_ALIGN_OF_POINTER 8
- #define PR_ALIGN_OF_WORD 8
-
-+#elif defined(__powerpc64__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#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 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#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 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#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 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 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 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__powerpc__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+
-+#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"
Deleted: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h
==============================================================================
--- branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Sun Aug 12 13:40:46 2012 (r925)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- ../pr/include/md/_freebsd.h.orig 2004-11-22 21:24:53.000000000 +0000
-+++ ../pr/include/md/_freebsd.h 2010-06-07 20:53:33.000000000 +0000
-@@ -57,6 +57,10 @@
- #define _PR_SI_ARCHITECTURE "ia64"
- #elif defined(__amd64__)
- #define _PR_SI_ARCHITECTURE "amd64"
-+#elif defined(__powerpc64__)
-+#define _PR_SI_ARCHITECTURE "powerpc64"
-+#elif defined(__powerpc__)
-+#define _PR_SI_ARCHITECTURE "powerpc"
- #else
- #error "Unknown CPU architecture"
- #endif
Copied and modified: branches/experimental/devel/nspr/files/patch-bug301986 (from r925, branches/experimental/devel/nspr/files/patch-pthread_t)
==============================================================================
Copied and modified: branches/experimental/devel/nspr/files/patch-bug782113 (from r925, branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg)
==============================================================================
--- branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg Sun Aug 12 13:32:19 2012 (r925, copy source)
+++ branches/experimental/devel/nspr/files/patch-bug782113 Sun Aug 12 13:40:46 2012 (r926)
@@ -1,6 +1,6 @@
---- ../pr/include/md/_freebsd.cfg.orig 2007-11-26 19:17:17.000000000 +0100
-+++ ../pr/include/md/_freebsd.cfg 2010-06-09 20:30:03.000000000 +0200
-@@ -283,6 +283,97 @@
+--- ../pr/include/md/_freebsd.cfg
++++ ../pr/include/md/_freebsd.cfg
+@@ -251,6 +251,97 @@
#define PR_ALIGN_OF_POINTER 8
#define PR_ALIGN_OF_WORD 8
@@ -33,7 +33,7 @@
+#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 6
+#define PR_BITS_PER_FLOAT_LOG2 5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2 6
@@ -98,3 +98,16 @@
#else
#error "Unknown CPU architecture"
+--- ../pr/include/md/_freebsd.h
++++ ../pr/include/md/_freebsd.h
+@@ -25,6 +25,10 @@
+ #define _PR_SI_ARCHITECTURE "ia64"
+ #elif defined(__amd64__)
+ #define _PR_SI_ARCHITECTURE "amd64"
++#elif defined(__powerpc64__)
++#define _PR_SI_ARCHITECTURE "powerpc64"
++#elif defined(__powerpc__)
++#define _PR_SI_ARCHITECTURE "powerpc"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
Deleted: branches/experimental/devel/nspr/files/patch-pthread_t
==============================================================================
--- branches/experimental/devel/nspr/files/patch-pthread_t Sun Aug 12 13:40:46 2012 (r925)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,35 +0,0 @@
-pthread_t can well be a 64-bit value -- on FreeBSD/amd64, for example.
-Better to just keep calling it pthread_t isntead of casting to anything.
-
- -mi
-
---- ../pr/include/private/pprthred.h Sun Apr 25 11:00:56 2004
-+++ ../pr/include/private/pprthred.h Tue Jul 12 00:52:42 2005
-@@ -44,4 +44,5 @@
- */
- #include "nspr.h"
-+#include <pthread.h>
-
- #if defined(XP_OS2)
-@@ -92,5 +92,5 @@
- ** when it is created or attached.
- */
--NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
-
- /*
---- ../pr/src/pthreads/ptthread.c Wed May 25 22:27:51 2005
-+++ ../pr/src/pthreads/ptthread.c Tue Jul 12 00:49:50 2005
-@@ -979,10 +979,10 @@
- }
-
--PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
-+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
- {
- #if defined(_PR_DCETHREADS)
- return (PRUint32)&thred->id; /* this is really a sham! */
- #else
-- return (PRUint32)thred->id; /* and I don't know what they will do with it */
-+ return thred->id; /* and I don't know what they will do with it */
- #endif
- }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208121340.q7CDekAI073875>