X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gosthash2012.c;h=9548bfb5492318313b83e631256479bbc4d43cc8;hb=3b31dea89630ecd3f741171ed3e1d4259adabf0e;hp=c4307e7213972e99d4f9aaa1991134b639ea19ba;hpb=3b827f9f3832ca8b53618ff18b5a7e0a95749986;p=openssl-gost%2Fengine.git

diff --git a/gosthash2012.c b/gosthash2012.c
index c4307e7..9548bfb 100644
--- a/gosthash2012.c
+++ b/gosthash2012.c
@@ -9,7 +9,7 @@
  */
 
 #include "gosthash2012.h"
-#ifdef __x86_64__
+#if defined(__x86_64__) || defined(__e2k__)
 # ifdef _MSC_VER
 #  include <intrin.h>
 # else
@@ -135,7 +135,7 @@ static void g(union uint512_u *h, const union uint512_u * RESTRICT N,
     X128R(xmm0, xmm2, xmm4, xmm6, xmm1, xmm3, xmm5, xmm7);
 
     STORE(h, xmm0, xmm2, xmm4, xmm6);
-# ifndef __x86_64__
+# ifndef __i386__
     /* Restore the Floating-point status on the CPU */
     /* This is only required on MMX, but EXTRACT32 is using MMX */
     _mm_empty();
@@ -195,7 +195,6 @@ static INLINE void stage3(gost2012_hash_ctx * CTX)
 void gost2012_hash_block(gost2012_hash_ctx * CTX,
                          const unsigned char *data, size_t len)
 {
-    register size_t chunksize;
     register size_t bufsize = CTX->bufsize;
 
     if (bufsize == 0) {
@@ -208,7 +207,7 @@ void gost2012_hash_block(gost2012_hash_ctx * CTX,
     }
 
     while (len) {
-        chunksize = 64 - bufsize;
+        register size_t chunksize = 64 - bufsize;
         if (chunksize > len)
             chunksize = len;