Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | |
| 2 | From Openembedded-Classic |
| 3 | |
| 4 | gnupg-1.4.10: Readd the ARM Thumb patch as debian has no thumb support |
| 5 | |
| 6 | |
| 7 | Upstream-Status: Inappropriate [embedded-specific] |
| 8 | |
| 9 | Index: gnupg-1.4.10/mpi/longlong.h |
| 10 | =================================================================== |
| 11 | --- gnupg-1.4.10.orig/mpi/longlong.h 2008-12-11 17:39:43.000000000 +0100 |
| 12 | +++ gnupg-1.4.10/mpi/longlong.h 2010-03-27 14:27:53.000000000 +0100 |
| 13 | @@ -706,18 +706,35 @@ |
| 14 | #endif /* __m88110__ */ |
| 15 | #endif /* __m88000__ */ |
| 16 | |
| 17 | +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ |
| 18 | +#if defined (__GNUC__) && defined (__GNUC_MINOR__) |
| 19 | +#define __GNUC_PREREQ(maj, min) \ |
| 20 | + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) |
| 21 | +#else |
| 22 | +#define __GNUC_PREREQ(maj, min) 0 |
| 23 | +#endif |
| 24 | + |
| 25 | /*************************************** |
| 26 | ************** MIPS ***************** |
| 27 | ***************************************/ |
| 28 | #if defined (__mips__) && W_TYPE_SIZE == 32 |
| 29 | -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 |
| 30 | +#if __GNUC_PREREQ (4,4) |
| 31 | +#define umul_ppmm(w1, w0, u, v) \ |
| 32 | + do { \ |
| 33 | + UDItype __ll = (UDItype)(u) * (v); \ |
| 34 | + w1 = __ll >> 32; \ |
| 35 | + w0 = __ll; \ |
| 36 | + } while (0) |
| 37 | +#endif |
| 38 | +#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) |
| 39 | #define umul_ppmm(w1, w0, u, v) \ |
| 40 | __asm__ ("multu %2,%3" \ |
| 41 | : "=l" ((USItype)(w0)), \ |
| 42 | "=h" ((USItype)(w1)) \ |
| 43 | : "d" ((USItype)(u)), \ |
| 44 | "d" ((USItype)(v))) |
| 45 | -#else |
| 46 | +#endif |
| 47 | +#if !defined (umul_ppmm) |
| 48 | #define umul_ppmm(w1, w0, u, v) \ |
| 49 | __asm__ ("multu %2,%3 \n" \ |
| 50 | "mflo %0 \n" \ |