From: Andy Grundman <andyg@activestate.com>
Date: Tue, 30 Aug 2016 21:25:10 +0000 (-0400)
Subject: Remove -xtarget=ultra from solaris(64)-sparcv9-cc builds.
X-Git-Tag: OpenSSL_1_1_1-pre1~3548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa4618a2805e7115cf47d0cf0d15cb7b3c944bba;p=openssl

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@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 895385ffd3..7cb44519f8 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",