From: Andy Polyakov <appro@openssl.org>
Date: Sat, 17 Jul 2004 12:54:54 +0000 (+0000)
Subject: IA-64 is intolerant to misaligned access. It was a problem on Win64 as
X-Git-Tag: OpenSSL_0_9_7e~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a77b16abd40d679cd8e75d53daa07eae1b78ea50;p=oweals%2Fopenssl.git

IA-64 is intolerant to misaligned access. It was a problem on Win64 as
we were mislead by _MSC_VER macro, which is defined by *all* Windows
Microsoft compilers.
---

diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_locl.h
index f290946058..4184729e34 100644
--- a/crypto/aes/aes_locl.h
+++ b/crypto/aes/aes_locl.h
@@ -62,7 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined(OPENSSL_SYS_WINCE)
+#if defined(_MSC_VER) && !defined(_M_IA64) && !defined(OPENSSL_SYS_WINCE)
 # define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
 # define GETU32(p) SWAP(*((u32 *)(p)))
 # define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }