diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-16 13:05:02 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-16 13:07:51 +0100 |
| commit | 8f29699cd1723bd8b8acc25033708f9777576d6d (patch) | |
| tree | 644a92835e5a794d2e946df7b6049d71efb68c37 /openssl | |
| parent | cb3f52275b51546b579d7856b75dca4ecf791c6a (diff) | |
asm fixes in openssl
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/makefile.mk | 11 | ||||
| -rw-r--r-- | openssl/openssl-asm-fix.patch | 11 |
2 files changed, 17 insertions, 5 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk index f29b567b857d..226e86cf2711 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -50,6 +50,7 @@ OPENSSL_NAME=openssl-0.9.8o TARFILE_NAME=$(OPENSSL_NAME) TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4 +PATCH_FILES=openssl-asm-fix.patch CONFIGURE_DIR=. CONFIGURE_ACTION=config @@ -83,7 +84,7 @@ OUT2INC += include/openssl/* UNAME=$(shell uname) .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID" - PATCH_FILES=openssllnx.patch + PATCH_FILES+=openssllnx.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8o.map \ libssl_OOo_0_9_8o.map @@ -107,7 +108,7 @@ UNAME=$(shell uname) .ENDIF .IF "$(OS)" == "SOLARIS" - PATCH_FILES=opensslsol.patch + PATCH_FILES+=opensslsol.patch ADDITIONAL_FILES:= \ libcrypto_OOo_0_9_8o.map \ libssl_OOo_0_9_8o.map @@ -129,7 +130,7 @@ UNAME=$(shell uname) .ENDIF .IF "$(OS)" == "IOS" - PATCH_FILES=opensslios.patch + PATCH_FILES+=opensslios.patch CONFIGURE_ACTION=Configure ios-armv7 CONFIGURE_FLAGS=no-shared no-idea .ENDIF @@ -137,7 +138,7 @@ UNAME=$(shell uname) .IF "$(OS)" == "WNT" .IF "$(COM)"=="GCC" -PATCH_FILES=opensslmingw.patch +PATCH_FILES+=opensslmingw.patch CONFIGURE_ACTION=$(PERL) Configure CONFIGURE_FLAGS=mingw shared INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a @@ -149,7 +150,7 @@ OUT2BIN = ssleay32.dll OUT2BIN += libeay32.dll .ELSE - PATCH_FILES=openssl.patch + PATCH_FILES+=openssl.patch .IF "$(MAKETARGETS)" == "" # The env. vars CC and PERL are used by nmake, and nmake insists on '\'s # If WRAPCMD is set it is prepended before the compiler, don't touch that. diff --git a/openssl/openssl-asm-fix.patch b/openssl/openssl-asm-fix.patch new file mode 100644 index 000000000000..bb722be7dfe0 --- /dev/null +++ b/openssl/openssl-asm-fix.patch @@ -0,0 +1,11 @@ +--- misc/build/openssl-0.9.8o/crypto/md32_common.h.sav 2010-03-29 13:23:11.000000000 +0200 ++++ misc/build/openssl-0.9.8o/crypto/md32_common.h 2012-03-16 12:39:14.986941958 +0100 +@@ -165,7 +165,7 @@ + asm ( \ + "roll %1,%0" \ + : "=r"(ret) \ +- : "I"(n), "0"(a) \ ++ : "I"(n), "0"((unsigned int)(a)) \ + : "cc"); \ + ret; \ + }) |