[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  68ca1737ce58173001f2146b913388f872842f69 (commit)
      from  195852fefc1ef090977ed3cc3334f1dfbd6bac34 (commit)


- Log -----------------------------------------------------------------
commit 68ca1737ce58173001f2146b913388f872842f69
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Apr 5 15:38:09 2019 +0200

    Configurations/10-main.conf: Don't inherit assembler in Cygwin-common
    
    The targets Cygwin-x86 and Cygwin-x86_64 are the ones that should do
    this.
    
    Fixes #8684
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8685)

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

Summary of changes:
 Configurations/10-main.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 0e3afd3..27e587f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1431,7 +1431,7 @@ my %targets = (
 
 #### Cygwin
     "Cygwin-common" => {
-        inherit_from     => [ "BASE_unix", asm("x86_asm") ],
+        inherit_from     => [ "BASE_unix" ],
         template         => 1,
 
         CC               => "gcc",