From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 18 Oct 2011 00:02:42 +0000 (+0000)
Subject: Do global replace to remove assembly language object files.
X-Git-Tag: OpenSSL-fips-2_0-rc1~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1db4a63bc30ce264aad28eb36b87f44ffd059675;p=oweals%2Fopenssl.git

Do global replace to remove assembly language object files.
---

diff --git a/Configure b/Configure
index b624f35407..46d422308c 100755
--- a/Configure
+++ b/Configure
@@ -1554,8 +1554,8 @@ if ($aes_obj =~ /\.o$/)
 	# aes_ctr.o is not a real file, only indication that assembler
 	# module implements AES_ctr32_encrypt...
 	$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes_ctr\.o//);
-	$aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o// if ($no_sse2);
-	$aes_obj =~ s/\s*(vp|bs)aes-\w*\.o// if ($fipscanisterinternal eq "y");
+	$aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2);
+	$aes_obj =~ s/\s*(vp|bs)aes-\w*\.o//g if ($fipscanisterinternal eq "y");
 	$cflags.=" -DVPAES_ASM" if ($aes_obj =~ m/vpaes/);
 	$cflags.=" -DBSAES_ASM" if ($aes_obj =~ m/bsaes/);
 	}