aboutsummaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-08-29 16:58:31 +0200
committerRichard Levitte <levitte@openssl.org>2016-11-15 15:14:15 +0100
commit7b176a549ea374fc9b64c3fa7f0812239528b696 (patch)
tree801e7d00d2c082b3e34703fa3d8424574643080f /Configure
parent93880ce1338280aa048c4c65886fcd07c6147491 (diff)
downloadopenssl-7b176a549ea374fc9b64c3fa7f0812239528b696.tar.gz
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)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/Configure b/Configure
index 70a59f51d9..2bdf87b243 100755
--- a/Configure
+++ b/Configure
@@ -1206,6 +1206,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";
}