diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-02-02 10:18:40 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-03 15:56:34 +0000 |
commit | b1d4d3599fb03959f3e3d9c804a0ccc76c255dab (patch) | |
tree | 703ccd0a1005cda1fc802fbd9fcb12277892ad71 /meta/recipes-support/gnupg/gnupg-1.4.7 | |
parent | 954a0bf236bf04455b4d4e0daa69fa2fa713a4ae (diff) | |
download | poky-b1d4d3599fb03959f3e3d9c804a0ccc76c255dab.tar.gz |
gnupg: Add gplv2 version 1.4.7
(From OE-Core rev: daff80c595616de10f32e74e2881e851707c7ff9)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg-1.4.7')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch | 42 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch new file mode 100644 index 0000000000..dd4ec73eca --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | --- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000 | ||
2 | +++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000 | ||
3 | @@ -181,7 +181,7 @@ | ||
4 | /*************************************** | ||
5 | ************** ARM ****************** | ||
6 | ***************************************/ | ||
7 | -#if defined (__arm__) && W_TYPE_SIZE == 32 | ||
8 | +#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) | ||
9 | #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ | ||
10 | __asm__ ("adds %1, %4, %5\n" \ | ||
11 | "adc %0, %2, %3" \ | ||
12 | |||
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch new file mode 100644 index 0000000000..b101a5bbe7 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Index: gnupg-1.4.10/mpi/longlong.h | ||
2 | =================================================================== | ||
3 | --- gnupg-1.4.10.orig/mpi/longlong.h 2008-12-11 17:39:43.000000000 +0100 | ||
4 | +++ gnupg-1.4.10/mpi/longlong.h 2010-03-27 14:27:53.000000000 +0100 | ||
5 | @@ -706,18 +706,35 @@ | ||
6 | #endif /* __m88110__ */ | ||
7 | #endif /* __m88000__ */ | ||
8 | |||
9 | +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ | ||
10 | +#if defined (__GNUC__) && defined (__GNUC_MINOR__) | ||
11 | +#define __GNUC_PREREQ(maj, min) \ | ||
12 | + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) | ||
13 | +#else | ||
14 | +#define __GNUC_PREREQ(maj, min) 0 | ||
15 | +#endif | ||
16 | + | ||
17 | /*************************************** | ||
18 | ************** MIPS ***************** | ||
19 | ***************************************/ | ||
20 | #if defined (__mips__) && W_TYPE_SIZE == 32 | ||
21 | -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | ||
22 | +#if __GNUC_PREREQ (4,4) | ||
23 | +#define umul_ppmm(w1, w0, u, v) \ | ||
24 | + do { \ | ||
25 | + UDItype __ll = (UDItype)(u) * (v); \ | ||
26 | + w1 = __ll >> 32; \ | ||
27 | + w0 = __ll; \ | ||
28 | + } while (0) | ||
29 | +#endif | ||
30 | +#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) | ||
31 | #define umul_ppmm(w1, w0, u, v) \ | ||
32 | __asm__ ("multu %2,%3" \ | ||
33 | : "=l" ((USItype)(w0)), \ | ||
34 | "=h" ((USItype)(w1)) \ | ||
35 | : "d" ((USItype)(u)), \ | ||
36 | "d" ((USItype)(v))) | ||
37 | -#else | ||
38 | +#endif | ||
39 | +#if !defined (umul_ppmm) | ||
40 | #define umul_ppmm(w1, w0, u, v) \ | ||
41 | __asm__ ("multu %2,%3 \n" \ | ||
42 | "mflo %0 \n" \ | ||