summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-09 09:03:05 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-09 10:06:29 +0100
commitfd87700995a65d54e78630f1f8f960e258a7977a (patch)
tree8d2b654df84498312e14ccd845d6922fb112da1d /Configure
parenta6da6b73ca480cfa6fe8d0a882f4ff549d46fcff (diff)
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)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure2
1 files changed, 1 insertions, 1 deletions
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}));