[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  cdf2986a70d92668d882eb29737225f1aaafd0f1 (commit)
      from  d049485cfb1b64a0937e3eb2191168b3d3bce3aa (commit)


- Log -----------------------------------------------------------------
commit cdf2986a70d92668d882eb29737225f1aaafd0f1
Author: Tomas Mraz <tomas at openssl.org>
Date:   Mon Jun 7 08:54:20 2021 +0200

    Add -latomic only for architectures where needed
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15640)

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

Summary of changes:
 Configurations/10-main.conf | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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