diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-07-01 16:24:08 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2019-07-01 20:13:03 -0400 |
| commit | 211da00b79f5ab9df62f69ddff65d493759eae4c (patch) | |
| tree | de20393740a5eb220900bf14ef82a9dd86a46d0b /Configurations | |
| parent | 66e2dbc01cb20b267bf132c945f49c303f63d7c4 (diff) | |
Remove EXPORT_VAR_AS_FUNC
We only export functions, not global, so remove the config option
and some of the #ifdef stuff.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9285)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 2 | ||||
| -rw-r--r-- | Configurations/50-win-onecore.conf | 4 | ||||
| -rw-r--r-- | Configurations/README | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index ad85990287..9b08cf4f5d 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1274,7 +1274,6 @@ my %targets = ( shared_target => "win-shared", # meaningless except it gives Configure a hint thread_scheme => "winthreads", dso_scheme => "win32", - bn_ops => "EXPORT_VAR_AS_FN", perl_platform => 'Windows::MSVC', # additional parameter to build_scheme denotes install-path "flavour" build_scheme => add("VC-common", { separator => undef }), @@ -1426,7 +1425,6 @@ my %targets = ( threads("-D_MT")), lib_cppflags => "-DL_ENDIAN", ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), - bn_ops => "EXPORT_VAR_AS_FN", thread_scheme => "winthreads", dso_scheme => "win32", shared_target => "mingw-shared", diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf index 2cc3928e9e..42a1ee00b2 100644 --- a/Configurations/50-win-onecore.conf +++ b/Configurations/50-win-onecore.conf @@ -47,7 +47,7 @@ my %targets = ( inherit_from => [ "VC-noCE-common" ], defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", "OPENSSL_SYS_WIN_CORE"), - bn_ops => "BN_LLONG RC4_CHAR EXPORT_VAR_AS_FN", + bn_ops => "BN_LLONG RC4_CHAR", lflags => add("/NODEFAULTLIB:kernel32.lib"), ex_libs => "onecore.lib", multilib => "-arm", @@ -56,7 +56,7 @@ my %targets = ( inherit_from => [ "VC-noCE-common" ], defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", "OPENSSL_SYS_WIN_CORE"), - bn_ops => "SIXTY_FOUR_BIT RC4_CHAR EXPORT_VAR_AS_FN", + bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", lflags => add("/NODEFAULTLIB:kernel32.lib"), ex_libs => "onecore.lib", multilib => "-arm64", diff --git a/Configurations/README b/Configurations/README index fa99539050..a0618ca2d3 100644 --- a/Configurations/README +++ b/Configurations/README @@ -236,9 +236,6 @@ In each table entry, the following keys are significant: up of 'unsigned char's; RC4_INT RC4 key schedule is made up of 'unsigned int's; - EXPORT_VAR_AS_FN for shared libraries, - export vars as - accessor functions. [1] as part of the target configuration, one can have a key called |