From ed57d89bd18f6f4b3db52567f9a718c31d717aa8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 4 Oct 2018 17:40:33 +0200 Subject: [PATCH] Change the build of engines to use ordinal files for symbol export Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7347) --- engines/build.info | 20 ++++++++++++++++++++ util/engines.num | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 util/engines.num diff --git a/engines/build.info b/engines/build.info index df173ea69d..53730068d9 100644 --- a/engines/build.info +++ b/engines/build.info @@ -15,26 +15,46 @@ IF[{- !$disabled{"engine"} -}] SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} DEPEND[padlock]=../libcrypto INCLUDE[padlock]=../include + IF[{- defined $target{shared_defflag} -}] + SHARED_SOURCE[padlock]=padlock.ld + GENERATE[padlock.ld]=../util/engines.num + ENDIF IF[{- !$disabled{capieng} -}] ENGINES=capi SOURCE[capi]=e_capi.c DEPEND[capi]=../libcrypto INCLUDE[capi]=../include + IF[{- defined $target{shared_defflag} -}] + SHARED_SOURCE[capi]=capi.ld + GENERATE[capi.ld]=../util/engines.num + ENDIF ENDIF IF[{- !$disabled{afalgeng} -}] ENGINES=afalg SOURCE[afalg]=e_afalg.c DEPEND[afalg]=../libcrypto INCLUDE[afalg]= ../include + IF[{- defined $target{shared_defflag} -}] + SHARED_SOURCE[afalg]=afalg.ld + GENERATE[afalg.ld]=../util/engines.num + ENDIF ENDIF ENGINES_NO_INST=ossltest dasync SOURCE[dasync]=e_dasync.c DEPEND[dasync]=../libcrypto INCLUDE[dasync]=../include + IF[{- defined $target{shared_defflag} -}] + SHARED_SOURCE[dasync]=dasync.ld + GENERATE[dasync.ld]=../util/engines.num + ENDIF SOURCE[ossltest]=e_ossltest.c DEPEND[ossltest]=../libcrypto INCLUDE[ossltest]=../include + IF[{- defined $target{shared_defflag} -}] + SHARED_SOURCE[ossltest]=ossltest.ld + GENERATE[ossltest.ld]=../util/engines.num + ENDIF ENDIF GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \ diff --git a/util/engines.num b/util/engines.num new file mode 100644 index 0000000000..4fc4e001df --- /dev/null +++ b/util/engines.num @@ -0,0 +1,2 @@ +bind_engine 1 * EXIST::FUNCTION: +v_check 2 * EXIST::FUNCTION: -- 2.25.1