[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6e42e3ff9cde43830555549fdafa2a8b37b9485b (commit)
      from  a193388811db7e842ed7d1966bbe2552095b26cc (commit)


- Log -----------------------------------------------------------------
commit 6e42e3ff9cde43830555549fdafa2a8b37b9485b
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Mar 4 11:32:26 2016 +0100

    perlasm/x86_64-xlate.pl: handle binary constants early.
    
    Not all assemblers of "gas" flavour handle binary constants, e.g.
    seasoned MacOS Xcode doesn't, so give them a hand.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/perlasm/x86_64-xlate.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 0a023fb..80ab17f 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -195,6 +195,7 @@ my %globals;
     sub out {
     	my $self = shift;
 
+	$self->{value} =~ s/\b(0b[0-1]+)/oct($1)/eig;
 	if ($gas) {
 	    # Solaris /usr/ccs/bin/as can't handle multiplications
 	    # in $self->{value}
@@ -205,7 +206,6 @@ my %globals;
 	    }
 	    sprintf "\$%s",$self->{value};
 	} else {
-	    $self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;
 	    $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
 	    sprintf "%s",$self->{value};
 	}