[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  fd87700995a65d54e78630f1f8f960e258a7977a (commit)
      from  a6da6b73ca480cfa6fe8d0a882f4ff549d46fcff (commit)


- Log -----------------------------------------------------------------
commit fd87700995a65d54e78630f1f8f960e258a7977a
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 9 09:03:05 2018 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5291)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index c90a66c..e3d8d70 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}));