[SCM] GNU gnutls branch, master, updated. gnutls_3_0_4-32-g27146d0

[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=27146d06e16c8ca870d821fa6f1a773954aeb170

The branch, master has been updated
       via  27146d06e16c8ca870d821fa6f1a773954aeb170 (commit)
      from  4ac912339d7b33b25c64116d1b6f420dcdaa4a67 (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 27146d06e16c8ca870d821fa6f1a773954aeb170
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Oct 25 19:50:47 2011 +0200

    Added coff version of cpuid.

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

Summary of changes:
 lib/accelerated/x86/Makefile.am                    |    2 +-
 .../x86/{coff => asm-coff}/appro-aes-x86-coff.s    |    0
 .../{asm/cpuid-x86.s => asm-coff/cpuid-x86-coff.s} |   19 +++++--------------
 .../x86/{coff => asm-coff}/padlock-x86-coff.s      |    0
 4 files changed, 6 insertions(+), 15 deletions(-)
 rename lib/accelerated/x86/{coff => asm-coff}/appro-aes-x86-coff.s (100%)
 copy lib/accelerated/x86/{asm/cpuid-x86.s => asm-coff/cpuid-x86-coff.s} (82%)
 rename lib/accelerated/x86/{coff => asm-coff}/padlock-x86-coff.s (100%)

diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index 689f977..550bdca 100644
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -47,7 +47,7 @@ else
 
 AM_CFLAGS += -DASM_X86_32 -DASM_X86
 if WIN32
-libx86_la_SOURCES += coff/appro-aes-x86-coff.s coff/padlock-x86-coff.s 
asm/cpuid-x86.s
+libx86_la_SOURCES += asm-coff/appro-aes-x86-coff.s asm-coff/padlock-x86-coff.s 
asm-coff/cpuid-x86-coff.s
 else
 libx86_la_SOURCES += asm/appro-aes-x86.s asm/padlock-x86.s asm/cpuid-x86.s
 endif
diff --git a/lib/accelerated/x86/coff/appro-aes-x86-coff.s 
b/lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s
similarity index 100%
rename from lib/accelerated/x86/coff/appro-aes-x86-coff.s
rename to lib/accelerated/x86/asm-coff/appro-aes-x86-coff.s
diff --git a/lib/accelerated/x86/asm/cpuid-x86.s 
b/lib/accelerated/x86/asm-coff/cpuid-x86-coff.s
similarity index 82%
copy from lib/accelerated/x86/asm/cpuid-x86.s
copy to lib/accelerated/x86/asm-coff/cpuid-x86-coff.s
index bf3e6ac..0a88d1b 100644
--- a/lib/accelerated/x86/asm/cpuid-x86.s
+++ b/lib/accelerated/x86/asm-coff/cpuid-x86-coff.s
@@ -22,9 +22,9 @@
        .file "cpuid.asm"
         
        .text
-       .align 16
 .globl _gnutls_cpuid
-.type _gnutls_cpuid,%function
+.def   _gnutls_cpuid;  .scl    2;      .type   32;     .endef
+.align 16
 _gnutls_cpuid:
        pushl   %ebp
        movl    %esp, %ebp
@@ -52,13 +52,11 @@ _gnutls_cpuid:
        movl    %ebp, %esp
        popl    %ebp
        ret
-.size _gnutls_cpuid, . - _gnutls_cpuid
 
-       .globl  _gnutls_have_cpuid
-       .type   _gnutls_have_cpuid, @function
+.globl _gnutls_have_cpuid
+.def   _gnutls_have_cpuid;     .scl    2;      .type   32;     .endef
+.align 16
 _gnutls_have_cpuid:
-.LFB0:
-       .cfi_startproc
        pushfl  
        pop %eax        
        orl $0x200000, %eax     
@@ -68,10 +66,3 @@ _gnutls_have_cpuid:
        pop %eax        
        andl $0x200000, %eax    
        ret
-       .cfi_endproc
-.LFE0:
-       .size   _gnutls_have_cpuid, .-_gnutls_have_cpuid
-
-#if defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
diff --git a/lib/accelerated/x86/coff/padlock-x86-coff.s 
b/lib/accelerated/x86/asm-coff/padlock-x86-coff.s
similarity index 100%
rename from lib/accelerated/x86/coff/padlock-x86-coff.s
rename to lib/accelerated/x86/asm-coff/padlock-x86-coff.s


hooks/post-receive
-- 
GNU gnutls