From 46d4d86577430fa3deeed967e394273975900fdb Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 29 Jan 2016 14:23:24 +0100 Subject: Configure: restore original logic for -DWHIRLPOOL_ASM. Reviewed-by: Richard Levitte --- Configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Configure') 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"; -- cgit v1.2.3