From d43e418445b631de1810b5078da67e51b6aba1b2 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Oct 23 2008 04:03:14 +0000 Subject: sparc64 patch now upstream, remove from cvs --- diff --git a/nspr-4.7.1-sparc64.patch b/nspr-4.7.1-sparc64.patch deleted file mode 100644 index 26223dd..0000000 --- a/nspr-4.7.1-sparc64.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.cfg.spot nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.cfg ---- nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.cfg.spot 2008-10-09 13:04:52.000000000 -0400 -+++ nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.cfg 2008-10-09 13:56:25.000000000 -0400 -@@ -331,10 +331,55 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - --#elif defined(__sparc__) -+#elif defined(__sparc__) && defined (__arch64__) - - #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_INT64 8 -+#define PR_ALIGN_OF_LONG 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 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__sparc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 - - #define PR_BYTES_PER_BYTE 1 - #define PR_BYTES_PER_SHORT 2 -diff -up nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.h.spot nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.h ---- nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.h.spot 2008-10-09 13:13:24.000000000 -0400 -+++ nspr-4.7.1/mozilla/nsprpub/pr/include/md/_linux.h 2008-10-09 13:14:43.000000000 -0400 -@@ -63,6 +63,8 @@ - #define _PR_SI_ARCHITECTURE "x86-64" - #elif defined(__mc68000__) - #define _PR_SI_ARCHITECTURE "m68k" -+#elif defined(__sparc__) && defined(__arch64__) -+#define _PR_SI_ARCHITECTURE "sparc64" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" - #elif defined(__i386__)