diff options
| author | Kenny Root <kroot@google.com> | 2015-11-05 19:56:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 19:56:07 +0000 |
| commit | 80043196325becce95d8fae59b7a8eb498839f40 (patch) | |
| tree | b4e43f0c1d2161af97e2b7e030644ca1d54a839c /src/crypto/perlasm/x86_64-xlate.pl | |
| parent | 849819d0477d239d23321236bd2324563606d64d (diff) | |
| parent | 307714c70648c5d1caa23193f59a78f2ff72d2ea (diff) | |
| download | external_boringssl-80043196325becce95d8fae59b7a8eb498839f40.zip external_boringssl-80043196325becce95d8fae59b7a8eb498839f40.tar.gz external_boringssl-80043196325becce95d8fae59b7a8eb498839f40.tar.bz2 | |
Merge "external/boringssl: sync with upstream."
am: 307714c706
* commit '307714c70648c5d1caa23193f59a78f2ff72d2ea':
external/boringssl: sync with upstream.
Diffstat (limited to 'src/crypto/perlasm/x86_64-xlate.pl')
| -rwxr-xr-x | src/crypto/perlasm/x86_64-xlate.pl | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/crypto/perlasm/x86_64-xlate.pl b/src/crypto/perlasm/x86_64-xlate.pl index 8b46329..3ebb018 100755 --- a/src/crypto/perlasm/x86_64-xlate.pl +++ b/src/crypto/perlasm/x86_64-xlate.pl @@ -79,22 +79,17 @@ my $nasmref=2.03; my $nasm=0; if ($flavour eq "mingw64") { $gas=1; $elf=0; $win64=1; + # TODO(davidben): Before supporting the + # mingw64 perlasm flavour, do away with this + # environment variable check. + die "mingw64 not supported"; $prefix=`echo __USER_LABEL_PREFIX__ | $ENV{CC} -E -P -`; chomp($prefix); } elsif ($flavour eq "macosx") { $gas=1; $elf=0; $prefix="_"; $decor="L\$"; } elsif ($flavour eq "masm") { $gas=0; $elf=0; $masm=$masmref; $win64=1; $decor="\$L\$"; } elsif ($flavour eq "nasm") { $gas=0; $elf=0; $nasm=$nasmref; $win64=1; $decor="\$L\$"; $PTR=""; } -elsif (!$gas) -{ if ($ENV{ASM} =~ m/nasm/ && `nasm -v` =~ m/version ([0-9]+)\.([0-9]+)/i) - { $nasm = $1 + $2*0.01; $PTR=""; } - elsif (`ml64 2>&1` =~ m/Version ([0-9]+)\.([0-9]+)(\.([0-9]+))?/) - { $masm = $1 + $2*2**-16 + $4*2**-32; } - die "no assembler found on %PATH" if (!($nasm || $masm)); - $win64=1; - $elf=0; - $decor="\$L\$"; -} +elsif (!$gas) { die "unknown flavour $flavour"; } my $current_segment; my $current_function; |