Browse Source

gnutls: fix compilation on x86-32

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Nikos Mavrogiannopoulos 10 years ago
parent
commit
d0eb4566b4
1 changed files with 28 additions and 0 deletions
  1. 28
    0
      libs/gnutls/patches/0001-nn-hash.patch

+ 28
- 0
libs/gnutls/patches/0001-nn-hash.patch View File

@@ -0,0 +1,28 @@
1
+diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h
2
+index 03fc8de..647c7d6 100644
3
+--- a/lib/accelerated/x86/x86-common.h
4
++++ b/lib/accelerated/x86/x86-common.h
5
+@@ -29,11 +29,13 @@ extern unsigned int _gnutls_x86_cpuid_s[4];
6
+ void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx,
7
+ 		  unsigned int *cx, unsigned int *dx);
8
+ 
9
+-#ifdef ASM_X86_32
10
++# ifdef ASM_X86_32
11
+ unsigned int gnutls_have_cpuid(void);
12
+-#else
13
+-#define gnutls_have_cpuid() 1
14
+-#endif				/* ASM_X86_32 */
15
++# else
16
++#  define gnutls_have_cpuid() 1
17
++# endif				/* ASM_X86_32 */
18
++
19
++#endif
20
+ 
21
+ #define NN_HASH(name, update_func, digest_func, NAME) {	\
22
+  #name,						\
23
+@@ -44,5 +46,3 @@ unsigned int gnutls_have_cpuid(void);
24
+  (nettle_hash_update_func *) update_func,	\
25
+  (nettle_hash_digest_func *) digest_func	\
26
+ } 
27
+-
28
+-#endif