components/openssl/openssl-fips-140/patches/203-multi-definition.patch
changeset 4822 1fb8a14c6702
child 6964 c3b11711b2b9
equal deleted inserted replaced
4821:54dafbe33fdb 4822:1fb8a14c6702
       
     1 #
       
     2 # Patch developed in house.
       
     3 # The issue was reported to the Upstream by external person: Bug #3699.
       
     4 #
       
     5 --- openssl-0.9.8m/crypto/sparccpuid.S       Mon Jun 29 19:28:02 2015
       
     6 +++ openssl-0.9.8m/crypto/sparccpuid.S       Mon Jun 29 19:28:02 2015
       
     7 @@ -400,6 +400,8 @@
       
     8  .type	OPENSSL_cleanse,#function
       
     9  .size	OPENSSL_cleanse,.-OPENSSL_cleanse
       
    10 
       
    11 +
       
    12 +#if 0
       
    13  .global	_sparcv9_vis1_instrument_bus
       
    14  .align	8
       
    15  _sparcv9_vis1_instrument_bus:
       
    16 @@ -496,6 +498,8 @@
       
    17  .type	_sparcv9_vis1_instrument_bus2,#function
       
    18  .size	_sparcv9_vis1_instrument_bus2,.-_sparcv9_vis1_instrument_bus2
       
    19 
       
    20 +#endif
       
    21 +
       
    22  .section	".init",#alloc,#execinstr
       
    23  	call	solaris_locking_setup
       
    24  	nop