Add PADLOCK_ASM to dso_defines rather than lib_defines
authorRichard Levitte <levitte@openssl.org>
Wed, 13 Feb 2019 02:58:52 +0000 (03:58 +0100)
committerRichard Levitte <levitte@openssl.org>
Wed, 27 Feb 2019 10:34:39 +0000 (11:34 +0100)
Since the padlock code is an engine, the assembler is for a module,
not a library link to when building a program...  there's a
distinction.

Fixes #2311

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8220)

(cherry picked from commit 88780b1c5f6000fe6731fec74efe697bcf493b6c)

Configure

index aefd0ff15febbe576b35e0783e332171c5befcee..65aa11014dd25a9e047abb484cbae943b93e3268 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1419,7 +1419,7 @@ unless ($disabled{asm}) {
        push @{$config{lib_defines}}, "X25519_ASM";
     }
     if ($target{padlock_asm_src} ne $table{DEFAULTS}->{padlock_asm_src}) {
-       push @{$config{lib_defines}}, "PADLOCK_ASM";
+       push @{$config{dso_defines}}, "PADLOCK_ASM";
     }
     if ($target{poly1305_asm_src} ne "") {
        push @{$config{lib_defines}}, "POLY1305_ASM";