diff --git a/openssl-0.9.7-beta6-ia64.patch b/openssl-0.9.7-beta6-ia64.patch deleted file mode 100644 index ff1625d..0000000 --- a/openssl-0.9.7-beta6-ia64.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- openssl/crypto/bn/bn_lcl.h 2002-12-17 16:04:42.000000000 -0500 -+++ openssl/crypto/bn/bn_lcl.h 2002-12-17 16:12:59.000000000 -0500 -@@ -245,6 +245,15 @@ - : "a"(a),"g"(b) \ - : "cc"); - # 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 */ - diff --git a/openssl-0.9.8g-ia64.patch b/openssl-0.9.8g-ia64.patch new file mode 100644 index 0000000..ec982d2 --- /dev/null +++ b/openssl-0.9.8g-ia64.patch @@ -0,0 +1,19 @@ +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 */ + diff --git a/openssl.spec b/openssl.spec index a331346..071942f 100644 --- a/openssl.spec +++ b/openssl.spec @@ -47,7 +47,7 @@ Patch22: openssl-0.9.8b-x509-name-cmp.patch 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