diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-12 12:16:11 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-12 12:16:11 +0000 |
| commit | 4a5397fb68279702e6e0b20c514ff18713bdd38b (patch) | |
| tree | 5e30e2977c1aa52ae5e656b168cb9af15eceda49 /crypto/perlasm | |
| parent | f9542a4231d6c603b15f6cece0201070c08b1d90 (diff) | |
Configure, x86gas.pl: fix linker warnings in 32-bit Darwin build.
Diffstat (limited to 'crypto/perlasm')
| -rw-r--r-- | crypto/perlasm/x86gas.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl index d0b7ae27ae..4af871889a 100644 --- a/crypto/perlasm/x86gas.pl +++ b/crypto/perlasm/x86gas.pl @@ -160,7 +160,8 @@ sub ::file_end } if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) { my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,8"; - if ($::elf) { push (@out,"$tmp,4\n"); } + if ($::macosx) { push (@out,"$tmp,2\n"); } + elsif ($::elf) { push (@out,"$tmp,4\n"); } else { push (@out,"$tmp\n"); } } push(@out,$initseg) if ($initseg); @@ -183,7 +184,7 @@ sub ::align sub ::picmeup { my($dst,$sym,$base,$reflabel)=@_; - if ($::pic && ($::elf || $::aout)) + if (($::pic && ($::elf || $::aout)) || $::macosx) { if (!defined($base)) { &::call(&::label("PIC_me_up")); &::set_label("PIC_me_up"); |