[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  46d4d86577430fa3deeed967e394273975900fdb (commit)
      from  8ab31975bacb9c907261088937d3aa4102e3af84 (commit)


- Log -----------------------------------------------------------------
commit 46d4d86577430fa3deeed967e394273975900fdb
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Jan 29 14:23:24 2016 +0100

    Configure: restore original logic for -DWHIRLPOOL_ASM.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configure | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index 8beaabd..3c2e16a 100755
--- a/Configure
+++ b/Configure
@@ -1052,10 +1052,12 @@ if (!$no_asm) {
 	$config{cflags}.=" -DVPAES_ASM" if ($target{aes_obj} =~ m/vpaes/);
 	$config{cflags}.=" -DBSAES_ASM" if ($target{aes_obj} =~ m/bsaes/);
     }
-    if ($target{wp_obj} =~ /mmx/ && $config{processor} eq "386") {
-	$target{wp_obj}=$table{BASE}->{wp_obj};
-    } elsif (!$disabled{"whirlpool"}) {
-	$config{cflags}.=" -DWHIRLPOOL_ASM";
+    if ($target{wp_obj} =~ /mmx/) {
+        if ($config{processor} eq "386") {
+	    $target{wp_obj}=$table{BASE}->{wp_obj};
+	} elsif (!$disabled{"whirlpool"}) {
+	    $config{cflags}.=" -DWHIRLPOOL_ASM";
+	}
     }
     if ($target{modes_obj} =~ /ghash-/) {
 	$config{cflags}.=" -DGHASH_ASM";