[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fa4618a2805e7115cf47d0cf0d15cb7b3c944bba (commit)
      from  c2efa78309e39019642f922b2babc1fd35f68768 (commit)


- Log -----------------------------------------------------------------
commit fa4618a2805e7115cf47d0cf0d15cb7b3c944bba
Author: Andy Grundman <andyg at activestate.com>
Date:   Tue Aug 30 17:25:10 2016 -0400

    Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.
    
    This flag got moved after -xarch=v9 in 1.1.0 and had the unexpected
    side effect of the compiler building for 32-bit v8plusa instead of v9.
    
    GH#1521
    CLA: none; trivial
    
    Signed-off-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

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 895385f..7cb4451 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -308,11 +308,11 @@ sub vms_info {
     },
     "solaris-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before("-xarch=v8plus -xtarget=ultra"),
+        cflags           => add_before("-xarch=v8plus"),
     },
     "solaris64-sparcv9-cc" => {
         inherit_from     => [ "solaris-sparcv7-cc", asm("sparcv9_asm") ],
-        cflags           => add_before("-xarch=v9 -xtarget=ultra"),
+        cflags           => add_before("-xarch=v9"),
         lflags           => add_before("-xarch=v9"),
         bn_ops           => "BN_LLONG RC4_CHAR",
         shared_ldflag    => "-xarch=v9 -G -dy -z text",