Commit 2ad2281a authored by Pauli's avatar Pauli
Browse files

Make the OPENSSL_CPUID_OBJ define internal. 


Patch by @levitte.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5231)
parent 7ff3a3b9

Configure

+2 −0
Original line number Diff line number Diff line
@@ -1292,6 +1292,8 @@ 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");



    $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));



    # bn-586 is the only one implementing bn_*_part_words

include/openssl/opensslconf.h.in

+1 −3
Original line number Diff line number Diff line 
/*

 * {- join("\n * ", @autowarntext) -}

 *

 * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -119,8 +119,6 @@ extern "C" { 
# define DEPRECATEDIN_0_9_8(f)

#endif



{- $target{cpuid_obj} ne "mem_clr.o" ? "#define OPENSSL_CPUID_OBJ" : "" -}



/* Generate 80386 code? */

{- $config{processor} eq "386" ? "#define" : "#undef" -} I386_ONLY