[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Kurt Roeckx]

The branch OpenSSL_1_1_0-stable has been updated
       via  e9a86d6b4951a1c536d5536d1217e6be6455858a (commit)
      from  11f1fd4b0d1b3aef5c79b843d081dbb9bcd0b85f (commit)


- Log -----------------------------------------------------------------
commit e9a86d6b4951a1c536d5536d1217e6be6455858a
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Mon Nov 21 22:15:11 2016 +0100

    Add missing -zdelete for some linux arches
    
    b6d5ba1a9f004d637acac18ae3519fe063b6b5e1 forgot to update some linux arches.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    
    GH: #1977
    (cherry picked from commit 55ab86e4c202e202a2b9200291d038878a727815)

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

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

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 425ab2b..985220f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -708,7 +708,7 @@ sub vms_info {
         cflags           => add("-mabi=ilp32"),
         bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
         perlasm_scheme   => "linux64",
-        shared_ldflag    => "-mabi=ilp32",
+        shared_ldflag    => add("-mabi=ilp32"),
     },
 
     "linux-mips32" => {
@@ -790,7 +790,7 @@ sub vms_info {
         cflags           => add("-mx32 -DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT",
         perlasm_scheme   => "elf32",
-        shared_ldflag    => "-mx32",
+        shared_ldflag    => add("-mx32"),
         multilib         => "x32",
     },