From 2ad2281a8005dbc9046059693995c78a04ed9e37 Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 6 Feb 2018 07:15:53 +1000 Subject: [PATCH] Make the OPENSSL_CPUID_OBJ define internal. Patch by @levitte. Reviewed-by: Richard Levitte Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/5231) --- Configure | 2 ++ include/openssl/opensslconf.h.in | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configure b/Configure index 22d42fb9d9..a6f5a31969 100755 --- a/Configure +++ b/Configure @@ -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 diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index 2603247df2..16aa82e631 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -1,7 +1,7 @@ /* * {- 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 -- 2.25.1