diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-10-15 08:32:16 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-10-15 08:32:16 +0000 |
| commit | 8fcdb1e60f0dcc09dff5395de95e884d4f8610ce (patch) | |
| tree | c5e23a0413a6ead732e47540bb225ff60045e9d0 /crypto | |
| parent | e1db7c4e7a4913e29ed6d4b355a4c7b643138f33 (diff) | |
| download | openssl-8fcdb1e60f0dcc09dff5395de95e884d4f8610ce.tar.gz | |
Add android-x86.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/perlasm/x86asm.pl | 4 | ||||
| -rw-r--r-- | crypto/perlasm/x86gas.pl | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl index b7ddb8137f..eb543db2f6 100644 --- a/crypto/perlasm/x86asm.pl +++ b/crypto/perlasm/x86asm.pl @@ -218,7 +218,7 @@ sub ::asm_init $filename=$fn; $i386=$cpu; - $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=0; + $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0; if (($type eq "elf")) { $elf=1; require "x86gas.pl"; } elsif (($type eq "a\.out")) @@ -235,6 +235,8 @@ sub ::asm_init { $win32=1; require "x86masm.pl"; } elsif (($type eq "macosx")) { $aout=1; $macosx=1; require "x86gas.pl"; } + elsif (($type eq "android")) + { $elf=1; $android=1; require "x86gas.pl"; } else { print STDERR <<"EOF"; Pick one target type from diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl index 3a79106298..f6b8cc9679 100644 --- a/crypto/perlasm/x86gas.pl +++ b/crypto/perlasm/x86gas.pl @@ -209,7 +209,14 @@ sub ::picmeup sub ::initseg { my $f=$nmdecor.shift; - if ($::elf) + if ($::android) + { $initseg.=<<___; +.section .init_array +.align 4 +.long $f +___ + } + elsif ($::elf) { $initseg.=<<___; .section .init call $f |