[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  8794be2ed8d2e044d8b0135ddb7e903e81335c94 (commit)
      from  a0e53000a8d2f464c5a49e93abaa606e67d7558e (commit)


- Log -----------------------------------------------------------------
commit 8794be2ed8d2e044d8b0135ddb7e903e81335c94
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Jun 27 11:34:54 2018 +1000

    Remove development artifacts.
    
    The issue was discovered on the x86/64 when attempting to include
    libcrypto inside another shared library.  A relocation of type
    R_X86_64_PC32 was generated which causes a linker error.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6595)

-----------------------------------------------------------------------

Summary of changes:
 crypto/sha/asm/keccak1600-s390x.pl  | 1 -
 crypto/sha/asm/keccak1600-x86_64.pl | 1 -
 2 files changed, 2 deletions(-)

diff --git a/crypto/sha/asm/keccak1600-s390x.pl b/crypto/sha/asm/keccak1600-s390x.pl
index 4bd3619..58c44d8 100755
--- a/crypto/sha/asm/keccak1600-s390x.pl
+++ b/crypto/sha/asm/keccak1600-s390x.pl
@@ -335,7 +335,6 @@ ___
 }
 {
 $code.=<<___;
-.globl	KeccakF1600
 .type	KeccakF1600,\@function
 .align	32
 KeccakF1600:
diff --git a/crypto/sha/asm/keccak1600-x86_64.pl b/crypto/sha/asm/keccak1600-x86_64.pl
index d3f4c10..42de5bf 100755
--- a/crypto/sha/asm/keccak1600-x86_64.pl
+++ b/crypto/sha/asm/keccak1600-x86_64.pl
@@ -344,7 +344,6 @@ $code.=<<___;
 	ret
 .size	__KeccakF1600,.-__KeccakF1600
 
-.globl	KeccakF1600
 .type	KeccakF1600,\@abi-omnipotent
 .align	32
 KeccakF1600: