From: Andy Polyakov <appro@openssl.org>
Date: Mon, 4 Apr 2005 17:07:16 +0000 (+0000)
Subject: Solaris x86 linker erroneously pads .init segment with zeros instead of
X-Git-Tag: OpenSSL_0_9_7g~7^2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e5dbccc182f3ada92014f2569ed9624886040ce0;p=oweals%2Fopenssl.git

Solaris x86 linker erroneously pads .init segment with zeros instead of
nops, which causes SEGV at startup. So I don't align anymore.
---

diff --git a/crypto/amd64cpuid.pl b/crypto/amd64cpuid.pl
index 097f6b8d5c..777d557783 100644
--- a/crypto/amd64cpuid.pl
+++ b/crypto/amd64cpuid.pl
@@ -135,5 +135,4 @@ OPENSSL_ia32_cpuid:
 
 .section	.init
 	call	OPENSSL_cpuid_setup
-	.align	16
 ___
diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index 4381580be7..8414d10cfa 100644
--- a/crypto/perlasm/x86unix.pl
+++ b/crypto/perlasm/x86unix.pl
@@ -571,7 +571,6 @@ sub main'file_end
 		movl	%edx,0(%edi)
 		popl	%ebx
 		popl	%edi
-	.align	$align
 	1:
 ___
 		push (@out,$tmp);
@@ -716,7 +715,6 @@ sub main'initseg
 		$tmp=<<___;
 .section	.init
 	call	$under$f
-	.align	$align
 ___
 		}
 	elsif ($main'coff)