diff options
author | Richard Levitte <levitte@openssl.org> | 2016-08-29 16:58:31 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-11-15 15:15:52 +0100 |
commit | 5be6f71858a66060c7dcb46d0c015a55fc0b569d (patch) | |
tree | 68950581423f78889836e4192fecb58bc5da04a6 /Configure | |
parent | 20b53c3efedd192c5a4050bfd44d317e5d802d2e (diff) |
Only build the body of e_padlock when there are lower level routines
engines/e_padlock.c assumes that for all x86 and x86_64 platforms, the
lower level routines will be present. However, that's not always
true, for example for solaris-x86-cc, and that leads to build errors.
The better solution is to have configure detect if the lower level
padlock routines are being built, and define the macro PADLOCK_ASM if
they are, and use that macro in our C code.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1510)
(cherry picked from commit 7b176a549ea374fc9b64c3fa7f0812239528b696)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1191,6 +1191,9 @@ unless ($disabled{asm}) { if ($target{ec_asm_src} =~ /ecp_nistz256/) { push @{$config{defines}}, "ECP_NISTZ256_ASM"; } + if ($target{padlock_asm_src} ne $table{DEFAULTS}->{padlock_asm_src}) { + push @{$config{defines}}, "PADLOCK_ASM"; + } if ($target{poly1305_asm_src} ne "") { push @{$config{defines}}, "POLY1305_ASM"; } |