From: Pauli <paul.dale@oracle.com>
Date: Wed, 27 Jun 2018 01:34:54 +0000 (+1000)
Subject: Remove development artifacts.
X-Git-Tag: OpenSSL_1_1_1-pre9~212
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8794be2ed8d2e044d8b0135ddb7e903e81335c94;p=oweals%2Fopenssl.git

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@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6595)
---

diff --git a/crypto/sha/asm/keccak1600-s390x.pl b/crypto/sha/asm/keccak1600-s390x.pl
index 4bd3619f5f..58c44d8ac8 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 d3f4c10af1..42de5bf123 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: