diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 12:02:47 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 12:02:47 -0500 |
| commit | 7730cba2a50332c194f50a58b86359ea39a82bd1 (patch) | |
| tree | 64c8d7228da1454c02288068e57a9c61f8b0acd0 /lib/mpi | |
| parent | c20151dff8a6d503c0d0cc4387c33a618cdabcb7 (diff) | |
| parent | b69f0859dc8e633c5d8c06845811588fe17e68b3 (diff) | |
Merge tag 'v3.7-rc8' into spi/next
Linux 3.7-rc8
Diffstat (limited to 'lib/mpi')
| -rw-r--r-- | lib/mpi/longlong.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h index 678ce4f1e124..095ab157a521 100644 --- a/lib/mpi/longlong.h +++ b/lib/mpi/longlong.h | |||
| @@ -641,7 +641,14 @@ do { \ | |||
| 641 | ************** MIPS ***************** | 641 | ************** MIPS ***************** |
| 642 | ***************************************/ | 642 | ***************************************/ |
| 643 | #if defined(__mips__) && W_TYPE_SIZE == 32 | 643 | #if defined(__mips__) && W_TYPE_SIZE == 32 |
| 644 | #if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | 644 | #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 |
| 645 | #define umul_ppmm(w1, w0, u, v) \ | ||
| 646 | do { \ | ||
| 647 | UDItype __ll = (UDItype)(u) * (v); \ | ||
| 648 | w1 = __ll >> 32; \ | ||
| 649 | w0 = __ll; \ | ||
| 650 | } while (0) | ||
| 651 | #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | ||
| 645 | #define umul_ppmm(w1, w0, u, v) \ | 652 | #define umul_ppmm(w1, w0, u, v) \ |
| 646 | __asm__ ("multu %2,%3" \ | 653 | __asm__ ("multu %2,%3" \ |
| 647 | : "=l" ((USItype)(w0)), \ | 654 | : "=l" ((USItype)(w0)), \ |
| @@ -666,7 +673,15 @@ do { \ | |||
| 666 | ************** MIPS/64 ************** | 673 | ************** MIPS/64 ************** |
| 667 | ***************************************/ | 674 | ***************************************/ |
| 668 | #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64 | 675 | #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64 |
| 669 | #if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | 676 | #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 |
| 677 | #define umul_ppmm(w1, w0, u, v) \ | ||
| 678 | do { \ | ||
| 679 | typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ | ||
| 680 | __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ | ||
| 681 | w1 = __ll >> 64; \ | ||
| 682 | w0 = __ll; \ | ||
| 683 | } while (0) | ||
| 684 | #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | ||
| 670 | #define umul_ppmm(w1, w0, u, v) \ | 685 | #define umul_ppmm(w1, w0, u, v) \ |
| 671 | __asm__ ("dmultu %2,%3" \ | 686 | __asm__ ("dmultu %2,%3" \ |
| 672 | : "=l" ((UDItype)(w0)), \ | 687 | : "=l" ((UDItype)(w0)), \ |