[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  3188c9509e1775f15ffd42ccfffd0e6ea1929923 (commit)
      from  d3034d31e7c04b334dd245504dd4f56e513ca115 (commit)


- Log -----------------------------------------------------------------
commit 3188c9509e1775f15ffd42ccfffd0e6ea1929923
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Aug 24 17:05:05 2016 +0200

    Configurations/10-main.conf: fix solaris64-*-cc link problems.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 4a2abae..2838c3d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -231,7 +231,7 @@ sub vms_info {
                                               release => "-xO5 -xdepend -xbuiltin"),
                                        threads("-D_REENTRANT")),
         thread_scheme    => "pthreads",
-        lflags           => add(threads("-mt")),
+        lflags           => add("-xarch=generic64",threads("-mt")),
         ex_libs          => add(threads("-lpthread")),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "elf",
@@ -299,6 +299,7 @@ sub vms_info {
     "solaris64-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
         cflags           => add_before("-xarch=v9 -xtarget=ultra"),
+        lflags           => add_before("-xarch=v9"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",
         multilib         => "/64",