x86_64-xlate.pl: sha1 and md5 warnings made it to nasm 2.09, extend gnu
authorAndy Polyakov <appro@openssl.org>
Mon, 4 Jul 2011 13:10:50 +0000 (13:10 +0000)
committerAndy Polyakov <appro@openssl.org>
Mon, 4 Jul 2011 13:10:50 +0000 (13:10 +0000)
assembler workaround to all assemblers.

crypto/perlasm/x86_64-xlate.pl

index 616e263..784f458 100755 (executable)
@@ -250,13 +250,14 @@ my %globals;
        $self->{index} =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
        $self->{base}  =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
 
+       # Solaris /usr/ccs/bin/as can't handle multiplications
+       # in $self->{label}, new gas requires sign extension...
+       use integer;
+       $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
+       $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+       $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
+
        if ($gas) {
-           # Solaris /usr/ccs/bin/as can't handle multiplications
-           # in $self->{label}, new gas requires sign extension...
-           use integer;
-           $self->{label} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
-           $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
-           $self->{label} =~ s/([0-9]+)/$1<<32>>32/eg;
            $self->{label} =~ s/^___imp_/__imp__/   if ($flavour eq "mingw64");
 
            if (defined($self->{index})) {