author | Ronald Jordan <ron.jordan@oracle.com> |
Wed, 26 Oct 2016 13:19:33 -0700 | |
branch | s11u3-sru |
changeset 7163 | ee09edbd5876 |
permissions | -rw-r--r-- |
7163
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
1 |
# |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
2 |
# Patch developed in house. |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
3 |
# The issue was reported to the Upstream by external person: Bug #3699. |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
4 |
# |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
5 |
--- openssl-0.9.8m/crypto/sparccpuid.S Mon Jun 29 19:28:02 2015 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
6 |
+++ openssl-0.9.8m/crypto/sparccpuid.S Mon Jun 29 19:28:02 2015 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
7 |
@@ -428,6 +428,8 @@ |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
8 |
.type OPENSSL_cleanse,#function |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
9 |
.size OPENSSL_cleanse,.-OPENSSL_cleanse |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
10 |
|
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
11 |
+ |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
12 |
+#if 0 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
13 |
.global _sparcv9_vis1_instrument_bus |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
14 |
.weak _sparcv9_vis1_instrument_bus |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
15 |
.align 8 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
16 |
@@ -496,6 +498,8 @@ |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
17 |
.type _sparcv9_vis1_instrument_bus2,#function |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
18 |
.size _sparcv9_vis1_instrument_bus2,.-_sparcv9_vis1_instrument_bus2 |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
19 |
|
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
20 |
+#endif |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
21 |
+ |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
22 |
.section ".init",#alloc,#execinstr |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
23 |
call solaris_locking_setup |
ee09edbd5876
24784774 Upgrade 11.3-SRU to OpenSSL 1.0.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
24 |
nop |