[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_19-2-gbe1614b

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=be1614b89e52969b8203666b057679d61ec8dc7c

The branch, gnutls_3_0_x-2 has been updated
       via  be1614b89e52969b8203666b057679d61ec8dc7c (commit)
      from  a4e735b948562f1093dbd5f98c1b2aa4eb741ee9 (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 be1614b89e52969b8203666b057679d61ec8dc7c
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