Attachment 156665 Details for Bug 197577 – mips64 and mips*el fixup

[patch] mips64 and mips*el fixup

patch-mips64el (text/plain), 4.54 KB, created by Jan Beich on 2015-05-11 18:35:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-05-11 18:35:17 UTC

Size: 4.54 KB

patch

obsolete

># HG changeset patch
># User Jan Beich <jbeich@FreeBSD.org>
># Date 1431369012 0
>#      Mon May 11 18:30:12 2015 +0000
># Node ID 2f7db4b0eca49dfe4527d906c3025e55f53ff917
># Parent  955bfb84eb9d58318a71345beee331cac041186b
>Bug ? - Unbreak mips64 and mips*el support on FreeBSD. r?wtc
>
>diff --git a/pr/include/md/_freebsd.cfg b/pr/include/md/_freebsd.cfg
>--- ../pr/include/md/_freebsd.cfg
>+++ ../pr/include/md/_freebsd.cfg
>@@ -387,65 +387,26 @@
> #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
> 
>-#elif defined(__mips__)
>+#elif defined(__mips64__)
> 
>+#ifdef __MIPSEB__
> #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
>-
>-#elif defined(__mips64__)
>-
>-#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
>@@ -478,16 +439,66 @@
> #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(__mips__)
>+
>+#ifdef __MIPSEB__
>+#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"
> 
> #endif
> 
> #ifndef NO_NSPR_10_SUPPORT
> 
>diff --git a/pr/include/md/_freebsd.h b/pr/include/md/_freebsd.h
>--- ../pr/include/md/_freebsd.h
>+++ ../pr/include/md/_freebsd.h
>@@ -26,20 +26,20 @@
> #elif defined(__amd64__)
> #define _PR_SI_ARCHITECTURE "amd64"
> #elif defined(__powerpc64__)
> #define _PR_SI_ARCHITECTURE "powerpc64"
> #elif defined(__powerpc__)
> #define _PR_SI_ARCHITECTURE "powerpc"
> #elif defined(__arm__)
> #define _PR_SI_ARCHITECTURE "arm"
>+#elif defined(__mips64__)
>+#define _PR_SI_ARCHITECTURE "mips64"
> #elif defined(__mips__)
> #define _PR_SI_ARCHITECTURE "mips"
>-#elif defined(__mips64__)
>-#define _PR_SI_ARCHITECTURE "mips64"
> #else
> #error "Unknown CPU architecture"
> #endif
> #if defined(__ELF__)
> #define PR_DLL_SUFFIX          ".so"
> #else
> #define PR_DLL_SUFFIX          ".so.1.0"
> #endif

Actions: View | Diff

Attachments on bug 197577: 156292 | 156362 | 156665 | 156666