do not redefine the _gnutls_x86_cpuid_s symbol

diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
index 6d4526fe17300c96155ec4e03a0e885c72d25d73..1a2681f4d3cc3798bc1e24697e434e2fc1576099 100644 (file)
--- 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 ff24578a764fc62a9eafed527f4bf70c57533d71..2b2440a5d4281668082a2cb6d7df0a6d0b4a645d 100644 (file)
--- 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 ae04d324991f15dfc3902cc446ca7b0bcea12deb..03fc8dea25a019b14a349131213a2ce11cf4c501 100644 (file)
--- 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