[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  2c702ef27dd632de08d56456f7f6af11e3e05b5f (commit)
      from  e70452155e7d93118d33f4dde964a67d4ac1b505 (commit)


- Log -----------------------------------------------------------------
commit 2c702ef27dd632de08d56456f7f6af11e3e05b5f
Author: H.J. Lu <hongjiu.lu at intel.com>
Date:   Wed Feb 26 13:04:41 2020 +1000

    x86_64: Replace .asciz "GNU" with .byte
    
    Replace .asciz "GNU" with .byte since .asciz isn't supported on Solaris.
    Fixes https://github.com/openssl/openssl/issues/11132
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11137)

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

Summary of changes:
 crypto/perlasm/x86_64-xlate.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index aff165c5fa..f87f1a5b96 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -115,7 +115,12 @@ if ($flavour =~ /elf/) {
 	.long 4f - 1f
 	.long 5
 0:
-	.asciz "GNU"
+	# "GNU" encoded with .byte, since .asciz isn't supported
+	# on Solaris.
+	.byte 0x47
+	.byte 0x4e
+	.byte 0x55
+	.byte 0
 1:
 	.p2align $p2align
 	.long 0xc0000002