[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  00372d7551ccf41ddb4fe8f00d62923e4dc65574 (commit)
       via  ef57f7996b6a93fc0ab80ed7dc17ff7d549869ff (commit)
      from  b6b66573bdeb369636be66104687f211dfad03aa (commit)


- Log -----------------------------------------------------------------
commit 00372d7551ccf41ddb4fe8f00d62923e4dc65574
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Aug 23 17:19:08 2019 +0200

    crypto/bn/build.info: define OPENSL_IA32_SSE2 globally when needed
    
    This is done conditionally.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/9679)

commit ef57f7996b6a93fc0ab80ed7dc17ff7d549869ff
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Aug 23 17:16:48 2019 +0200

    Configure: Allow 'DEFINE[]=def'
    
    DEFINE[] definitions end up pushed in @{$config{defines}} instead of
    being added to the output file list of defines.  This allows for the
    unusual case where we need something to be defined globally, so it
    gets picked up by anything using $(CPPFLAGS).
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/9679)

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

Summary of changes:
 Configure            | 39 ++++++++++++++++++++++++---------------
 crypto/bn/build.info |  2 +-
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/Configure b/Configure
index 30f9e61a7c..21bd348d52 100755
--- a/Configure
+++ b/Configure
@@ -1908,7 +1908,7 @@ if ($builder eq "unified") {
             qr/^\s*INCLUDE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
             => sub { push @{$includes{$1}}, tokenize($expand_variables->($2))
                          if !@skip || $skip[$#skip] > 0 },
-            qr/^\s*DEFINE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
+            qr/^\s*DEFINE\[((?:\\.|[^\\\]])*)\]\s*=\s*(.*)\s*$/
             => sub { push @{$defines{$1}}, tokenize($expand_variables->($2))
                          if !@skip || $skip[$#skip] > 0 },
             qr/^\s*DEPEND\[((?:\\.|[^\\\]])*)\]\s*=\s*(.*)\s*$/
@@ -2109,24 +2109,33 @@ EOF
             }
         }
 
-        foreach (keys %defines) {
-            my $dest = $_;
-            my $ddest = cleanfile($sourced, $_, $blddir);
+        foreach my $dest (keys %defines) {
+            my $ddest;
 
-            # If the destination doesn't exist in source, it can only be
-            # a generated file in the build tree.
-            if (! -f $ddest) {
-                $ddest = cleanfile($buildd, $_, $blddir);
-                if ($unified_info{rename}->{$ddest}) {
-                    $ddest = $unified_info{rename}->{$ddest};
+            if ($dest ne "") {
+                $ddest = cleanfile($sourced, $dest, $blddir);
+
+                # If the destination doesn't exist in source, it can only
+                # be a generated file in the build tree.
+                if (! -f $ddest) {
+                    $ddest = cleanfile($buildd, $dest, $blddir);
+                    if ($unified_info{rename}->{$ddest}) {
+                        $ddest = $unified_info{rename}->{$ddest};
+                    }
                 }
             }
-            foreach (@{$defines{$dest}}) {
-                m|^([^=]*)(=.*)?$|;
+            foreach my $v (@{$defines{$dest}}) {
+                $v =~ m|^([^=]*)(=.*)?$|;
                 die "0 length macro name not permitted\n" if $1 eq "";
-                die "$1 defined more than once\n"
-                    if defined $unified_info{defines}->{$ddest}->{$1};
-                $unified_info{defines}->{$ddest}->{$1} = $2;
+                if ($dest ne "") {
+                    die "$1 defined more than once\n"
+                        if defined $unified_info{defines}->{$ddest}->{$1};
+                    $unified_info{defines}->{$ddest}->{$1} = $2;
+                } else {
+                    die "$1 defined more than once\n"
+                        if grep { $v eq $_ } @{$config{defines}};
+                    push @{$config{defines}}, $v;
+                }
             }
         }
     }
diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index 8353b32227..c2df4e07c9 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -96,7 +96,7 @@ IF[{- !$disabled{asm} -}]
       $BNDEF=$BNDEF $BNDEF_{- $target{asm_arch} -}_ec2m
     ENDIF
     IF[{- !$disabled{sse2} -}]
-      $BNDEF_sse2=$BNDEF $BNDEF_{- $target{asm_arch} -}_sse2
+      DEFINE[]=$BNDEF_{- $target{asm_arch} -}_sse2
     ENDIF
   ENDIF
 ENDIF