[openssl-commits] [openssl] OpenSSL source code branch master updated. 179f6b2f552adb2740f30634d75edc4448f516b5

[Rich Salz]

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 "OpenSSL source code".

The branch, master has been updated
       via  179f6b2f552adb2740f30634d75edc4448f516b5 (commit)
      from  89f40f369f414b52e00f7230b0e3ce99e430a508 (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 179f6b2f552adb2740f30634d75edc4448f516b5
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Dec 17 17:20:42 2014 -0500

    RT3544: Restore MWERKS for NetWare
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/rand/rand_nw.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crypto/rand/rand_nw.c b/crypto/rand/rand_nw.c
index 9239a72..91158b8 100644
--- a/crypto/rand/rand_nw.c
+++ b/crypto/rand/rand_nw.c
@@ -154,7 +154,13 @@ int RAND_poll(void)
 
    for( i=2; i<ENTROPY_NEEDED; i++)
    {
-#if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#ifdef __MWERKS__
+      asm
+      {
+         rdtsc
+         mov tsc, eax
+      }
+#elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
       asm volatile("rdtsc":"=a"(tsc)::"edx");
 #endif
 


hooks/post-receive
-- 
OpenSSL source code