components/openssl/openssl-fips-140/patches/203-multi-definition.patch
author Ronald Jordan <ron.jordan@oracle.com>
Wed, 01 Feb 2017 10:56:54 -0800
branchs11u3-sru
changeset 7633 aba3229536ba
parent 7163 ee09edbd5876
permissions -rw-r--r--
25455837 Upgrade OpenSSL version to 1.0.2k 25078626 problem in LIBRARY/OPENSSL 25455809 problem in LIBRARY/OPENSSL 25455821 problem in LIBRARY/OPENSSL

#
# Patch developed in house.
# The issue was reported to the Upstream by external person: Bug #3699.
#
--- openssl-0.9.8m/crypto/sparccpuid.S       Mon Jun 29 19:28:02 2015
+++ openssl-0.9.8m/crypto/sparccpuid.S       Mon Jun 29 19:28:02 2015
@@ -428,6 +428,8 @@
 .type	OPENSSL_cleanse,#function
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse

+
+#if 0
 .global	_sparcv9_vis1_instrument_bus
 .weak	_sparcv9_vis1_instrument_bus
 .align	8
@@ -496,6 +498,8 @@
 .type	_sparcv9_vis1_instrument_bus2,#function
 .size	_sparcv9_vis1_instrument_bus2,.-_sparcv9_vis1_instrument_bus2

+#endif
+
 .section	".init",#alloc,#execinstr
 	call	solaris_locking_setup
 	nop