diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-04-29 15:19:11 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-01 05:10:01 +0200 |
| commit | 535130c39d33df41b6a7d14302a93ffaa10ebc46 (patch) | |
| tree | 8e0d54bd6c3d225bbe692e78f3d05b18c63999f7 | |
| parent | Fix no-fips-securitychecks test failure (diff) | |
| download | openssl-535130c39d33df41b6a7d14302a93ffaa10ebc46.tar.xz openssl-535130c39d33df41b6a7d14302a93ffaa10ebc46.zip | |
Add -latomic to threads enabled 32bit linux builds
It might not be necessary with the most recent toolchain versions
but apparently many 32bit linux architectures and commonly used
toolchain versions require this.
It is also harmless to include even on architectures that do not
need it.
Fixes #14083
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15086)
| -rw-r--r-- | Configurations/10-main.conf | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 1e53f20861..8427a561e3 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -675,7 +675,7 @@ my %targets = ( #### # *-generic* is endian-neutral target, but ./config is free to # throw in -D[BL]_ENDIAN, whichever appropriate... - "linux-generic32" => { + "linux-generic" => { inherit_from => [ "BASE_unix" ], CC => "gcc", CXX => "g++", @@ -697,8 +697,13 @@ my %targets = ( shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, enable => [ "afalgeng" ], }, + "linux-generic32" => { + inherit_from => [ "linux-generic" ], + ex_libs => add(threads("-latomic")), + bn_ops => "BN_LLONG RC4_CHAR", + }, "linux-generic64" => { - inherit_from => [ "linux-generic32" ], + inherit_from => [ "linux-generic" ], bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", }, @@ -945,6 +950,7 @@ my %targets = ( cflags => add("-m64 -mcpu=ultrasparc"), cxxflags => add("-m64 -mcpu=ultrasparc"), lib_cppflags => add("-DB_ENDIAN"), + ex_libs => add(threads("-latomic")), bn_ops => "BN_LLONG RC4_CHAR", asm_arch => 'sparcv9', perlasm_scheme => 'void', |