components/openssl/openssl-fips-140/patches/203-multi-definition.patch
changeset 4822 1fb8a14c6702
child 6964 c3b11711b2b9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-fips-140/patches/203-multi-definition.patch	Fri Aug 28 11:04:52 2015 -0700
@@ -0,0 +1,24 @@
+#
+# 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
+@@ -400,6 +400,8 @@
+ .type	OPENSSL_cleanse,#function
+ .size	OPENSSL_cleanse,.-OPENSSL_cleanse
+
++
++#if 0
+ .global	_sparcv9_vis1_instrument_bus
+ .align	8
+ _sparcv9_vis1_instrument_bus:
+@@ -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