root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Add -latomic only for architectures where needed 

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15640)
This commit is contained in:
Tomas Mraz 2021-06-07 08:54:20 +02:00 committed by Pauli
parent d049485cfb
commit cdf2986a70
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Configurations/10-main.conf
View File

@ -677,7 +677,7 @@ my %targets = (
#### ####
# *-generic* is endian-neutral target, but ./config is free to # *-generic* is endian-neutral target, but ./config is free to
# throw in -D[BL]_ENDIAN, whichever appropriate... # throw in -D[BL]_ENDIAN, whichever appropriate...
"linux-generic" => { "linux-generic32" => {
inherit_from => [ "BASE_unix" ], inherit_from => [ "BASE_unix" ],
CC => "gcc", CC => "gcc",
CXX => "g++", CXX => "g++",
@ -699,18 +699,17 @@ my %targets = (
shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
enable => [ "afalgeng" ], enable => [ "afalgeng" ],
}, },
"linux-generic32" => { "linux-latomic" => {
inherit_from => [ "linux-generic" ], inherit_from => [ "linux-generic32" ],
ex_libs => add(threads("-latomic")), ex_libs => add(threads("-latomic")),
bn_ops => "BN_LLONG RC4_CHAR",
}, },
"linux-generic64" => { "linux-generic64" => {
inherit_from => [ "linux-generic" ], inherit_from => [ "linux-generic32" ],
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
}, },
"linux-ppc" => { "linux-ppc" => {
inherit_from => [ "linux-generic32" ], inherit_from => [ "linux-latomic" ],
asm_arch => 'ppc32', asm_arch => 'ppc32',
perlasm_scheme => "linux32", perlasm_scheme => "linux32",
lib_cppflags => add("-DB_ENDIAN"), lib_cppflags => add("-DB_ENDIAN"),
@ -765,7 +764,7 @@ my %targets = (
# #
# ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
# #
inherit_from => [ "linux-generic32" ], inherit_from => [ "linux-latomic" ],
asm_arch => 'armv4', asm_arch => 'armv4',
perlasm_scheme => "linux32", perlasm_scheme => "linux32",
}, },
@ -786,7 +785,7 @@ my %targets = (
"linux-mips32" => { "linux-mips32" => {
# Configure script adds minimally required -march for assembly # Configure script adds minimally required -march for assembly
# support, if no -march was specified at command line. # support, if no -march was specified at command line.
inherit_from => [ "linux-generic32" ], inherit_from => [ "linux-latomic" ],
cflags => add("-mabi=32"), cflags => add("-mabi=32"),
cxxflags => add("-mabi=32"), cxxflags => add("-mabi=32"),
asm_arch => 'mips32', asm_arch => 'mips32',
@ -795,7 +794,7 @@ my %targets = (
# mips32 and mips64 below refer to contemporary MIPS Architecture # mips32 and mips64 below refer to contemporary MIPS Architecture
# specifications, MIPS32 and MIPS64, rather than to kernel bitness. # specifications, MIPS32 and MIPS64, rather than to kernel bitness.
"linux-mips64" => { "linux-mips64" => {
inherit_from => [ "linux-generic32" ], inherit_from => [ "linux-latomic" ],
cflags => add("-mabi=n32"), cflags => add("-mabi=n32"),
cxxflags => add("-mabi=n32"), cxxflags => add("-mabi=n32"),
bn_ops => "RC4_CHAR", bn_ops => "RC4_CHAR",
@ -929,7 +928,7 @@ my %targets = (
#### SPARC Linux setups #### SPARC Linux setups
"linux-sparcv8" => { "linux-sparcv8" => {
inherit_from => [ "linux-generic32" ], inherit_from => [ "linux-latomic" ],
cflags => add("-mcpu=v8"), cflags => add("-mcpu=v8"),
cxxflags => add("-mcpu=v8"), cxxflags => add("-mcpu=v8"),
lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"), lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"),
@ -939,7 +938,7 @@ my %targets = (
"linux-sparcv9" => { "linux-sparcv9" => {
# it's a real mess with -mcpu=ultrasparc option under Linux, # it's a real mess with -mcpu=ultrasparc option under Linux,
# but -Wa,-Av8plus should do the trick no matter what. # but -Wa,-Av8plus should do the trick no matter what.
inherit_from => [ "linux-generic32" ], inherit_from => [ "linux-latomic" ],
cflags => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"), cflags => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"),
cxxflags => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"), cxxflags => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"),
lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"), lib_cppflags => add("-DB_ENDIAN -DBN_DIV2W"),