From: Andy Polyakov <appro@openssl.org>
Date: Wed, 26 Feb 2014 08:28:22 +0000 (+0100)
Subject: Configure: blended processor target in solaris-x86-cc.
X-Git-Tag: OpenSSL_1_0_2-beta2~313
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=241c8004ce919729195d3038a653cdb0c8ba25d0;ds=sidebyside

Configure: blended processor target in solaris-x86-cc.
(cherry picked from commit 7bb9d84e35dce137c4479915ab0cbdb10ad0cf1d)
---

diff --git a/Configure b/Configure
index 42edeb4a61..f1d09a3ccb 100755
--- a/Configure
+++ b/Configure
@@ -226,7 +226,7 @@ my %table=(
 "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
  
 #### Solaris x86 with Sun C setups
-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-x86-cc","cc:-fast -xarch=generic -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
 
 #### SPARC Solaris with GNU C setups
diff --git a/TABLE b/TABLE
index 1d00e39038..b5fe7dc02c 100644
--- a/TABLE
+++ b/TABLE
@@ -5711,7 +5711,7 @@ $multilib     =
 
 *** solaris-x86-cc
 $cc           = cc
-$cflags       = -fast -O -Xa
+$cflags       = -fast -xarch=generic -O -Xa
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       =