diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-02-10 10:43:52 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-02-10 10:43:52 +0100 |
| commit | 5f42b741b401b3115126f6b0e29fc4c260bb6fd8 (patch) | |
| tree | d67a0225577fcfe6b363bcde0533c13246952e90 | |
| parent | 93880eb0db13f97c014bbd2735b14d3bdc76fe46 (diff) | |
| download | gnutls-5f42b741b401b3115126f6b0e29fc4c260bb6fd8.tar.gz | |
do not redefine the _gnutls_x86_cpuid_s symbol
| -rw-r--r-- | lib/accelerated/x86/aes-cbc-x86-aesni.c | 2 | ||||
| -rw-r--r-- | lib/accelerated/x86/aes-cbc-x86-ssse3.c | 2 | ||||
| -rw-r--r-- | lib/accelerated/x86/x86.h | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c index 9d9eff318a..3f2fac1942 100644 --- a/lib/accelerated/x86/aes-cbc-x86-aesni.c +++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c @@ -39,8 +39,6 @@ struct aes_ctx { int enc; }; -unsigned int _gnutls_x86_cpuid_s[4]; - static int aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) { diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c index fb53772871..a828d43edd 100644 --- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c +++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c @@ -39,8 +39,6 @@ struct aes_ctx { int enc; }; -unsigned int _gnutls_x86_cpuid_s[4]; - static int aes_cipher_init(gnutls_cipher_algorithm_t algorithm, void **_ctx, int enc) { diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86.h index ae04d32499..03fc8dea25 100644 --- a/lib/accelerated/x86/x86.h +++ b/lib/accelerated/x86/x86.h @@ -22,6 +22,8 @@ #include <config.h> +extern unsigned int _gnutls_x86_cpuid_s[4]; + #if defined(ASM_X86) void gnutls_cpuid(unsigned int func, unsigned int *ax, unsigned int *bx, @@ -43,5 +45,4 @@ unsigned int gnutls_have_cpuid(void); (nettle_hash_digest_func *) digest_func \ } - #endif |