From: Andy Polyakov <appro@openssl.org>
Date: Tue, 2 Mar 2010 16:23:40 +0000 (+0000)
Subject: Fix s390x-specific HOST_l2c|c2l.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1232
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=d8c7bd6e1111efa66e4a0ee72d95a7dff4eea601

Fix s390x-specific HOST_l2c|c2l.

Submitted by: Andreas Krebbel
---

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 279916fa59..1cb783944e 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -241,11 +241,11 @@
 #ifndef PEDANTIC
 # if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
 #  if defined(__s390x__)
-#   define HOST_c2l(c,l)	({ asm ("lrv	%0,0(%1)"		\
-					:"=r"(l) : "r"(c));		\
+#   define HOST_c2l(c,l)	({ asm ("lrv	%0,%1"			\
+				   :"=d"(l) :"m"(*(const unsigned int *)(c)));\
 				   (c)+=4; (l);				})
-#   define HOST_l2c(l,c)	({ asm ("strv	%0,0(%1)"		\
-					: : "r"(l),"r"(c) : "memory");	\
+#   define HOST_l2c(l,c)	({ asm ("strv	%1,%0"			\
+				   :"=m"(*(unsigned int *)(c)) :"d"(l));\
 				   (c)+=4; (l);				})
 #  endif
 # endif