From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 10 Feb 2014 09:43:52 +0000 (+0100)
Subject: do not redefine the _gnutls_x86_cpuid_s symbol
X-Git-Tag: gnutls_3_3_0pre0~202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54768ca1cd9049bbd1c695696ef3c8595c6052db;p=thirdparty%2Fgnutls.git

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 6d4526fe17..1a2681f4d3 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 ff24578a76..2b2440a5d4 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