[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  72eb100f8a38c5b3822d7751eddaa2f3f4576fa1 (commit)
      from  f2dbb71cb6bf6cd570f96e7663a22dd87854f08b (commit)


- Log -----------------------------------------------------------------
commit 72eb100f8a38c5b3822d7751eddaa2f3f4576fa1
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 15 10:40:18 2019 +0200

    Don't use '-z defs' with Clang's sanitizers
    
    The clang documentation in all sanitizers we currently use says this:
    
        When linking shared libraries, the {flavor}Sanitizer run-time is
        not linked, so -Wl,-z,defs may cause link errors (don’t use it
        with {flavor}Sanitizer)
    
    (in our case, {flavor} is one of Address, Memory, or UndefinedBehavior)
    
    Therefore, we turn off that particular flag specifically when using
    the sanitizers.
    
    Fixes #8735
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8749)

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

Summary of changes:
 Configurations/shared-info.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index f821ad7..83f28bd 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -32,7 +32,10 @@ my %shared_info;
         return {
             %{$shared_info{'gnu-shared'}},
             shared_defflag    => '-Wl,--version-script=',
-            dso_ldflags       => '-z defs',
+            dso_ldflags       =>
+                $disabled{asan} && $disabled{msan} && $disabled{ubsan}
+                ? '-z defs'
+                : '',
         };
     },
     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },