Configure: restore original logic for -DWHIRLPOOL_ASM.

Reviewed-by: Richard Levitte <levitte@openssl.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/Configure b/Configure
index 8beaabd950..3c2e16a26c 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";