[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-40-g56aff6a

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=56aff6a6e9962c0f31d44e4401f61ac1f3489c17

The branch, gnutls_3_0_x has been updated
       via  56aff6a6e9962c0f31d44e4401f61ac1f3489c17 (commit)
       via  0b7b701d334b0033f9a88cabf575b6e77017861a (commit)
      from  a5504873526001f69f9fe164721ac8352d1889dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56aff6a6e9962c0f31d44e4401f61ac1f3489c17
Merge: a550487 0b7b701
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Aug 29 17:28:58 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

-----------------------------------------------------------------------

Summary of changes:
 lib/accelerated/x86.h |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/lib/accelerated/x86.h b/lib/accelerated/x86.h
index 8886516..df411df 100644
--- a/lib/accelerated/x86.h
+++ b/lib/accelerated/x86.h
@@ -5,8 +5,27 @@
 # define cpuid __cpuid
 
 #else
-#define cpuid(func,ax,bx,cx,dx)\
+
+# ifdef ASM_X86_64
+
+#  define cpuid(func,ax,bx,cx,dx)\
   __asm__ __volatile__ ("cpuid":\
   "=a" (ax), "=b" (bx), "=c" (cx), "=d" (dx) : "a" (func));
 
+# else
+/* some GCC versions complain on the version above */
+#  define cpuid(func, a, b, c, d) g_cpuid(func, &a, &b, &c, &d)
+
+inline static void g_cpuid(uint32_t func, unsigned int *ax, unsigned int *bx, 
unsigned int *cx, unsigned int* dx)
+{
+    asm volatile ("pushl %%ebx\n"
+                  "cpuid\n" 
+                  "movl %%ebx, %1\n"
+                  "popl %%ebx\n"
+                  :"=a" (*ax), "=r"(*bx), "=c"(*cx), "=d"(*cx)
+                  :"a"(func)
+                  :"cc");
+}
+# endif
+
 #endif


hooks/post-receive
-- 
GNU gnutls