[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  7f81aed4bccbeb0ad491b68dd601d576c4956c78 (commit)
      from  0f6c3ebbf85b93ca78f6b5e5cead8f406fe70123 (commit)


- Log -----------------------------------------------------------------
commit 7f81aed4bccbeb0ad491b68dd601d576c4956c78
Author: John Baldwin <jhb at FreeBSD.org>
Date:   Wed Jun 10 15:19:00 2020 -0700

    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 #12050.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12110)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf   | 1 -
 Configurations/shared-info.pl | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 7b5da5c469..a44a74cb32 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1004,7 +1004,6 @@ my %targets = (
         CFLAGS           => add(picker(release => "-fomit-frame-pointer")),
         lib_cppflags     => add("-DL_ENDIAN"),
         bn_ops           => "BN_LLONG",
-        shared_target    => "bsd-shared",
         asm_arch         => 'x86',
         perlasm_scheme   => "a.out",
     },
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 4243591493..82e828dc41 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -40,12 +40,6 @@ my %shared_info;
         };
     },
     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
-    'bsd-shared' => sub {
-        return $shared_info{'gnu-shared'} if detect_gnu_ld();
-        return {
-            shared_ldflag     => '-shared -nostdlib',
-        };
-    },
     'darwin-shared' => {
         module_ldflags        => '-bundle',
         shared_ldflag         => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',