svn commit: r1462159 - in /openoffice/trunk/main/openssl: makefile.mk openssl-0.9.8o-clang.patch

[hd...@apache.org]

Author: hdu
Date: Thu Mar 28 15:35:11 2013
New Revision: 1462159

URL: http://svn.apache.org/r1462159
Log:
fix an inline asm input-output bitwidth mismatch

Clang rightfully rejects it, so we have to use the cast.
Upstream has a similar fix for its OpenSSL-fips-2_0* tags.

Added:
    openoffice/trunk/main/openssl/openssl-0.9.8o-clang.patch
Modified:
    openoffice/trunk/main/openssl/makefile.mk

Modified: openoffice/trunk/main/openssl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/makefile.mk?rev=1462159&r1=1462158&r2=1462159&view=diff
==============================================================================
--- openoffice/trunk/main/openssl/makefile.mk (original)
+++ openoffice/trunk/main/openssl/makefile.mk Thu Mar 28 15:35:11 2013
@@ -159,6 +159,8 @@ OUT2BIN += out/libeay32.dll
 	.ENDIF
 .ENDIF
 
+PATCH_FILES += openssl-0.9.8o-clang.patch
+
 #set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
 
 # --- Targets ------------------------------------------------------

Added: openoffice/trunk/main/openssl/openssl-0.9.8o-clang.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/openssl/openssl-0.9.8o-clang.patch?rev=1462159&view=auto
==============================================================================
--- openoffice/trunk/main/openssl/openssl-0.9.8o-clang.patch (added)
+++ openoffice/trunk/main/openssl/openssl-0.9.8o-clang.patch Thu Mar 28 15:35:11 2013
@@ -0,0 +1,11 @@
+--- misc/openssl-0.9.8o/crypto/md32_common.h	2010-03-29 13:23:11.000000000 +0200
++++ misc/build/openssl-0.9.8o/crypto/md32_common.h	2013-03-28 15:47:56.541077176 +0100
+@@ -165,7 +165,7 @@
+ 				asm (			\
+ 				"roll %1,%0"		\
+ 				: "=r"(ret)		\
+-				: "I"(n), "0"(a)	\
++				: "I"(n), "0"((unsigned int)(a)) \
+ 				: "cc");		\
+ 			   ret;				\
+ 			})