upstream/oracle/userland-gate: components/openssl/openssl-fips-140/patches/203-multi-definition.patch@c3b11711b2b9

author	Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
	Fri, 23 Sep 2016 12:03:45 -0700
changeset 6964	c3b11711b2b9
parent 4822	1fb8a14c6702
permissions	-rw-r--r--

24703781 Upgrade OpenSSL version to 1.0.2i 24703800 problem in LIBRARY/OPENSSL 24703856 problem in LIBRARY/OPENSSL 24703866 problem in LIBRARY/OPENSSL 24703911 problem in LIBRARY/OPENSSL 24703934 problem in LIBRARY/OPENSSL 24703939 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