SF.net SVN: gar:[22857] csw/mgar/pkg/openssl1/trunk/files/openssl-1.0. 1f-t4-engine.sparc.5.11.patch
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Jan 19 18:49:54 CET 2014
Revision: 22857
http://sourceforge.net/p/gar/code/22857
Author: chninkel
Date: 2014-01-19 17:49:52 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
openssl1/trunk: Fixed t4 engine patch which was depending on another solaris patch that we don't use here (wantboot)
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch
Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch 2014-01-19 17:48:29 UTC (rev 22856)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-t4-engine.sparc.5.11.patch 2014-01-19 17:49:52 UTC (rev 22857)
@@ -103,10 +103,9 @@
.global OPENSSL_cleanse
.align 32
OPENSSL_cleanse:
-@@ -398,6 +433,102 @@
+@@ -398,5 +433,101 @@
.size OPENSSL_cleanse,.-OPENSSL_cleanse
- #ifndef _BOOT
+.global _sparcv9_vis1_instrument_bus
+.align 8
+_sparcv9_vis1_instrument_bus:
@@ -211,7 +210,7 @@
diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c
--- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700
+++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700
-@@ -4,31 +4,55 @@
+@@ -4,27 +4,52 @@
#include <setjmp.h>
#include <signal.h>
#include <sys/time.h>
@@ -228,13 +227,9 @@
+#if defined(__GNUC__) && defined(__linux)
+__attribute__((visibility("hidden")))
+#endif
- #ifndef _BOOT
++
-static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
+unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_TICK_PRIVILEGED,0};
- #else
--static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
-+unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_VIS1,0};
- #endif
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num)
{
@@ -280,7 +275,7 @@
}
unsigned long _sparcv9_rdtick(void);
-@@ -36,11 +60,18 @@
+@@ -36,10 +60,17 @@
unsigned long _sparcv9_vis1_instrument(void);
void _sparcv9_vis2_probe(void);
void _sparcv9_fmadd_probe(void);
@@ -292,7 +287,6 @@
+size_t _sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t);
+#endif
- #ifndef _BOOT
unsigned long OPENSSL_rdtsc(void)
{
- if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
@@ -322,18 +316,9 @@
+ else
+ return 0;
+ }
- #endif
-
- #if defined(_BOOT)
-@@ -58,7 +107,7 @@
- */
- void OPENSSL_cpuid_setup(void)
- {
-- OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
-+ OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1;
- }
- #elif 0 && defined(__sun) && defined(__SVR4)
+ #if 0 && defined(__sun) && defined(__SVR4)
+ /* This code path is disabled, because of incompatibility of
@@ -85,11 +116,11 @@
if (!strcmp (name,"SUNW,UltraSPARC") ||
!strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */
@@ -2324,7 +2309,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/sparc_arch.h openssl-1.0.1f/crypto/sparc_arch.h
--- openssl-1.0.1f/crypto/sparc_arch.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/sparc_arch.h 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/sparc_arch.h 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,101 @@
+#ifndef __SPARC_ARCH_H__
+#define __SPARC_ARCH_H__
@@ -2431,7 +2416,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl
--- openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/md5/asm/md5-sparcv9.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,434 @@
+#!/usr/bin/env perl
+
@@ -2871,7 +2856,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl
--- openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/aes/asm/aest4-sparcv9.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,902 @@
+#!/usr/bin/env perl
+
@@ -3779,7 +3764,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl
--- openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/des/asm/dest4-sparcv9.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,602 @@
+#!/usr/bin/env perl
+
@@ -4387,7 +4372,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl
--- openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/perlasm/sparcv9_modes.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,1680 @@
+#!/usr/bin/env perl
+
@@ -6073,7 +6058,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl
--- openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/bn/asm/vis3-mont.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,373 @@
+#!/usr/bin/env perl
+
@@ -6452,7 +6437,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl
--- openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/bn/asm/sparcv9-gf2m.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,198 @@
+#!/usr/bin/env perl
+#
@@ -6656,7 +6641,7 @@
===================================================================
diff -uNr openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl
--- openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 2014-01-19 18:45:11.239901457 +0100
++++ openssl-1.0.1f/crypto/bn/asm/sparct4-mont.pl 2014-01-19 13:44:18.%N +0100
@@ -0,0 +1,1222 @@
+#!/usr/bin/env perl
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list