[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fd7dc201d3b9d43972de6a0e659f7ef6421c99cc (commit)
      from  d44bb1c31ca00f4359090daa15659c0dd1a08f0d (commit)


- Log -----------------------------------------------------------------
commit fd7dc201d3b9d43972de6a0e659f7ef6421c99cc
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Feb 10 15:11:40 2016 +0100

    perlasm/x86_64-xlate.pl: pass pure constants verbatim.
    
    RT#3885
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/perlasm/x86_64-xlate.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 87f6956..1f5bced 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -198,8 +198,11 @@ my %globals;
 	if ($gas) {
 	    # Solaris /usr/ccs/bin/as can't handle multiplications
 	    # in $self->{value}
-	    $self->{value} =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
-	    $self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+	    my $value = $self->{value};
+	    $value =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
+	    if ($value =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg) {
+		$self->{value} = $value;
+	    }
 	    sprintf "\$%s",$self->{value};
 	} else {
 	    $self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;