From: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed, 26 Feb 2020 03:04:41 +0000 (+1000)
Subject: x86_64: Replace .asciz "GNU" with .byte
X-Git-Tag: openssl-3.0.0-alpha1~384
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c702ef27dd632de08d56456f7f6af11e3e05b5f;p=oweals%2Fopenssl.git

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@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11137)
---

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