diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-30 14:44:59 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-01 09:49:16 +0200 |
| commit | ef2dfc9902e015de91f015177bdf235c9000839e (patch) | |
| tree | 61e6c5535dbf8c44096f6322defd2c88fdf4dfbf /Configurations/10-main.conf | |
| parent | b44882a0bd0717e0aab84f5dc3ef81ab673155e9 (diff) | |
Refactor linker script generation
The generation of linker scripts was badly balanced, as all sorts of
platform dependent stuff went into the top build.info, when that part
should really be made as simply and generic as possible.
Therefore, we move a lot of the "magic" to the build files templates,
since they are the place for platform dependent things. What remains
is to parametrize just enough in the build.info file to generate the
linker scripts correctly for each associated library.
"linker script" is a term usually reserved for certain Unix linkers.
However, we only use them to say what symbols should be exported, so
we use the term loosely for all platforms. The internal extension is
'.ld', and is changed by the build file templates as appropriate for
each target platform.
Note that this adds extra meaning to the value of the shared_target
attribute.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7333)
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 8360bb3671..e3cc34c14b 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -211,7 +211,7 @@ my %targets = ( ex_libs => add("-lsocket -lnsl -ldl"), dso_scheme => "dlfcn", thread_scheme => "pthreads", - shared_target => "self", + shared_target => "solaris", shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_ldflag => "-Wl,-Bsymbolic", shared_defflag => "-Wl,-M,", @@ -1113,7 +1113,7 @@ my %targets = ( lflags => "-Wl,-bsvr4", thread_scheme => "pthreads", dso_scheme => "dlfcn", - shared_target => "self", + shared_target => "aix", module_ldflags => "-Wl,-G,-bsymbolic,-bexpall", shared_ldflag => "-Wl,-G,-bsymbolic", shared_defflag => "-Wl,-bE:", @@ -1230,6 +1230,8 @@ my %targets = ( lib_defines => add("L_ENDIAN"), dso_cflags => "/Zi /Fddso.pdb", bin_cflags => "/Zi /Fdapp.pdb", + # def_flag made to empty string so a .def file gets generated + shared_defflag => '', shared_ldflag => "/dll", shared_target => "win-shared", # meaningless except it gives Configure a hint thread_scheme => "winthreads", @@ -1743,6 +1745,8 @@ my %targets = ( dso_cflags => "", ex_libs => add(sub { return vms_info()->{zlib} || (); }), shared_target => "vms-shared", + # def_flag made to empty string so a .opt file gets generated + shared_defflag => '', dso_scheme => "vms", thread_scheme => "pthreads", |