[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  55ab86e4c202e202a2b9200291d038878a727815 (commit)
      from  024d681e69cc1ea7177a7eae9aeb1947412950ed (commit)


- Log -----------------------------------------------------------------
commit 55ab86e4c202e202a2b9200291d038878a727815
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

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

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 6b0f368..59234a8 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -701,7 +701,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" => {
@@ -784,7 +784,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",
     },