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 097f6b8d5c17349876b03e5363768f985c5fa6e6..777d557783d8b6a85862fdb030a329d95feb104a 100644 (file)
--- a/crypto/amd64cpuid.pl
+++ b/crypto/amd64cpuid.pl
@@ -135,5 +135,4 @@ OPENSSL_ia32_cpuid:
 
 .section       .init
        call    OPENSSL_cpuid_setup
 
 .section       .init
        call    OPENSSL_cpuid_setup

-       .align  16

 ___
 ___

diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index 4381580be7b96cf95458fd8530e20b35eb83c138..8414d10cfaf64d18ee8b5eed4c31cecad9e06b9e 100644 (file)
--- 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
                movl    %edx,0(%edi)
                popl    %ebx
                popl    %edi

-       .align  $align

        1:
 ___
                push (@out,$tmp);
        1:
 ___
                push (@out,$tmp);


@@ -716,7 +715,6 @@ sub main'initseg
                $tmp=<<___;
 .section       .init
        call    $under$f
                $tmp=<<___;
 .section       .init
        call    $under$f

-       .align  $align

 ___
                }
        elsif ($main'coff)
 ___
                }
        elsif ($main'coff)