Skip to content

Commit 7f81aed

Browse files
bsdjhbbeldmit
authored andcommitted
Use the inherited 'bsd-gcc-shared' config on 32-bit x86 BSDs.
BSD-generic32 already uses this for building shared libraries on other 32-bit BSD platforms. Commit b7efa56 collapsed various *BSD targets down to the BSD-generic ones and BSD-x86. At the time only OpenBSD/i386 used `bsd-shared` while both FreeBSD and NetBSD used `bsd-gcc-shared`. In practice, all of the BSDs are using either a GCC/ld.bfd toolchain or a clang/lld toolchain both of which are compatible with 'bsd-gcc-shared'. Retire 'bsd-shared' since this removes the last user. Fixes openssl#12050. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Ben Kaduk <kaduk@mit.edu> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from openssl#12110)
1 parent 0f6c3eb commit 7f81aed

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

Configurations/10-main.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,6 @@ my %targets = (
10041004
CFLAGS => add(picker(release => "-fomit-frame-pointer")),
10051005
lib_cppflags => add("-DL_ENDIAN"),
10061006
bn_ops => "BN_LLONG",
1007-
shared_target => "bsd-shared",
10081007
asm_arch => 'x86',
10091008
perlasm_scheme => "a.out",
10101009
},

Configurations/shared-info.pl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ sub detect_gnu_cc {
4040
};
4141
},
4242
'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
43-
'bsd-shared' => sub {
44-
return $shared_info{'gnu-shared'} if detect_gnu_ld();
45-
return {
46-
shared_ldflag => '-shared -nostdlib',
47-
};
48-
},
4943
'darwin-shared' => {
5044
module_ldflags => '-bundle',
5145
shared_ldflag => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',

0 commit comments

Comments
 (0)