[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-47-g2da36bd

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=2da36bd42cca5f54564ff617ccb410b5ea8ad050

The branch, master has been updated
       via  2da36bd42cca5f54564ff617ccb410b5ea8ad050 (commit)
      from  34af48e99a369b01f633e7c2e65274ec3280d66f (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 2da36bd42cca5f54564ff617ccb410b5ea8ad050
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Wed Apr 25 12:02:46 2012 +0200

    Corrected win64 cpuid() code. Report and patch by Mann Ern Kang.

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

Summary of changes:
 devel/perlasm/cpuid-x86_64.pl                |    2 +-
 lib/accelerated/x86/coff/cpuid-x86-64-coff.s |   15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/devel/perlasm/cpuid-x86_64.pl b/devel/perlasm/cpuid-x86_64.pl
index ef1c95c..a6bb30e 100644
--- a/devel/perlasm/cpuid-x86_64.pl
+++ b/devel/perlasm/cpuid-x86_64.pl
@@ -27,7 +27,7 @@ $code=".text\n";
 
 $code.=<<___;
 .globl gnutls_cpuid
-.type gnutls_cpuid,\@abi-omnipotent
+.type gnutls_cpuid,\@function
 .align	16
 gnutls_cpuid:
 	pushq	%rbp
diff --git a/lib/accelerated/x86/coff/cpuid-x86-64-coff.s b/lib/accelerated/x86/coff/cpuid-x86-64-coff.s
index c86b645..60e6046 100644
--- a/lib/accelerated/x86/coff/cpuid-x86-64-coff.s
+++ b/lib/accelerated/x86/coff/cpuid-x86-64-coff.s
@@ -25,6 +25,17 @@
 .def	gnutls_cpuid;	.scl 2;	.type 32;	.endef
 .p2align	4
 gnutls_cpuid:
+	movq	%rdi,8(%rsp)
+	movq	%rsi,16(%rsp)
+	movq	%rsp,%rax
+.LSEH_begin_gnutls_cpuid:
+	movq	%rcx,%rdi
+	movq	%rdx,%rsi
+	movq	%r8,%rdx
+	movq	%r9,%rcx
+	movq	40(%rsp),%r8
+	movq	48(%rsp),%r9
+
 	pushq	%rbp
 	movq	%rsp,%rbp
 	pushq	%rbx
@@ -52,5 +63,7 @@ gnutls_cpuid:
 	movl	%ecx,(%rax)
 	popq	%rbx
 	leave
+	movq	8(%rsp),%rdi
+	movq	16(%rsp),%rsi
 	.byte	0xf3,0xc3
-
+.LSEH_end_gnutls_cpuid:


hooks/post-receive
-- 
GNU gnutls