diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-06-04 18:23:02 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-06-04 18:23:57 +0200 |
| commit | d0eb4566b4e366f734721a1077cdb051227c667d (patch) | |
| tree | b6b29a46123dab37b267104377635740aa1ac278 /libs/gnutls/patches | |
| parent | f068bdab79ecc4bb97d98d06dcf945b5ebec59e8 (diff) | |
gnutls: fix compilation on x86-32
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'libs/gnutls/patches')
| -rw-r--r-- | libs/gnutls/patches/0001-nn-hash.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libs/gnutls/patches/0001-nn-hash.patch b/libs/gnutls/patches/0001-nn-hash.patch new file mode 100644 index 000000000..948c1f292 --- /dev/null +++ b/libs/gnutls/patches/0001-nn-hash.patch @@ -0,0 +1,28 @@ +diff --git a/lib/accelerated/x86/x86-common.h b/lib/accelerated/x86/x86-common.h +index 03fc8de..647c7d6 100644 +--- a/lib/accelerated/x86/x86-common.h ++++ b/lib/accelerated/x86/x86-common.h +@@ -29,11 +29,13 @@ extern unsigned int _gnutls_x86_cpuid_s[4]; + void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, + unsigned int *cx, unsigned int *dx); + +-#ifdef ASM_X86_32 ++# ifdef ASM_X86_32 + unsigned int gnutls_have_cpuid(void); +-#else +-#define gnutls_have_cpuid() 1 +-#endif /* ASM_X86_32 */ ++# else ++# define gnutls_have_cpuid() 1 ++# endif /* ASM_X86_32 */ ++ ++#endif + + #define NN_HASH(name, update_func, digest_func, NAME) { \ + #name, \ +@@ -44,5 +46,3 @@ unsigned int gnutls_have_cpuid(void); + (nettle_hash_update_func *) update_func, \ + (nettle_hash_digest_func *) digest_func \ + } +- +-#endif |