From: Richard Levitte <levitte@openssl.org>
Date: Fri, 9 Feb 2018 08:03:05 +0000 (+0100)
Subject: Fix check of cpuid_asm_src config attribute
X-Git-Tag: OpenSSL_1_1_1-pre1~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fd87700995a65d54e78630f1f8f960e258a7977a;p=oweals%2Fopenssl.git

Fix check of cpuid_asm_src config attribute

The contents of that attribute is C file names, not object file names.
This went undetected because quite a lot of systems have assembler
implementations anyway, so setting OPENSSL_CPUID_OBJ was correct for
them.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5291)
---

diff --git a/Configure b/Configure
index c90a66ce9f..e3d8d70c00 100755
--- a/Configure
+++ b/Configure
@@ -1290,7 +1290,7 @@ if ($target{sys_id} ne "")
 
 unless ($disabled{asm}) {
     $target{cpuid_asm_src}=$table{DEFAULTS}->{cpuid_asm_src} if ($config{processor} eq "386");
-    push @{$config{defines}}, "OPENSSL_CPUID_OBJ" if ($target{cpuid_asm_src} ne "mem_clr.o");
+    push @{$config{defines}}, "OPENSSL_CPUID_OBJ" if ($target{cpuid_asm_src} ne "mem_clr.c");
 
     $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));