rpms/openssl/devel openssl-0.9.8g-ia64.patch, NONE, 1.1 openssl.spec, 1.112, 1.113 openssl-0.9.7-beta6-ia64.patch, 1.1, NONE

[Tomáš Mráz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14586

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8g-ia64.patch 
Removed Files:
	openssl-0.9.7-beta6-ia64.patch 
Log Message:
- rediff for no fuzz


openssl-0.9.8g-ia64.patch:

--- NEW FILE openssl-0.9.8g-ia64.patch ---
diff -up openssl-0.9.8g/crypto/bn/bn_lcl.h.ia64 openssl-0.9.8g/crypto/bn/bn_lcl.h
--- openssl-0.9.8g/crypto/bn/bn_lcl.h.ia64	2008-08-10 22:23:55.000000000 +0200
+++ openssl-0.9.8g/crypto/bn/bn_lcl.h	2008-08-10 22:23:55.000000000 +0200
@@ -279,6 +279,15 @@ extern "C" {
 #   define BN_UMULT_HIGH(a,b)		__umulh((a),(b))
 #   define BN_UMULT_LOHI(low,high,a,b)	((low)=_umul128((a),(b),&(high)))
 #  endif
+# elif defined(__ia64) && defined(SIXTY_FOUR_BIT_LONG)
+#  if defined(__GNUC__)
+#   define BN_UMULT_HIGH(a,b) ({      \
+      register BN_ULONG ret;          \
+      asm ("xmpy.hu %0 = %1, %2"      \
+           : "=f"(ret)                \
+           : "f"(a), "f"(b));         \
+      ret;                    })
+#  endif      /* compiler */
 # endif		/* cpu */
 #endif		/* OPENSSL_NO_ASM */
 


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- openssl.spec	10 Aug 2008 19:45:27 -0000	1.112
+++ openssl.spec	10 Aug 2008 20:36:12 -0000	1.113
@@ -47,7 +47,7 @@
 Patch23: openssl-0.9.8g-default-paths.patch
 Patch24: openssl-0.9.8g-no-extssl.patch
 # Functionality changes
-Patch32: openssl-0.9.7-beta6-ia64.patch
+Patch32: openssl-0.9.8g-ia64.patch
 Patch33: openssl-0.9.7f-ca-dir.patch
 Patch34: openssl-0.9.6-x509.patch
 Patch35: openssl-0.9.7-beta5-version-add-engines.patch


--- openssl-0.9.7-beta6-ia64.patch DELETED ---