For Solaris with old gcc versions (that don't understand

-mcpu=ultrasparc), don't silently step to solaris-sparc-gcc, which
would unnecessarily use less efficient assembler code.
Instead, use new configuration variant solaris-usparc-oldgcc;
this also means that someone who reads the output of ./config will
notice that it may be advantegeous to upgrade gcc.

diff --git a/Configure b/Configure
index efca607b0be95c150ad5bb1c1ca3455b60d259b2..6a0a12a9de88ef2921faa359c368101293d0c03c 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -107,6 +107,7 @@ my %table=(
 "solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_sol_asm",
 "solaris-sparc-gcc","gcc:-O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8.o::",
 "solaris-usparc-gcc","gcc:-O3 -fomit-frame-pointer -mcpu=ultrasparc -Wall -DB_ENDIAN -DULTRASPARC:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8plus-gcc.o:::asm/md5-sparcv8plus.o:",
 "solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_sol_asm",
 "solaris-sparc-gcc","gcc:-O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8.o::",
 "solaris-usparc-gcc","gcc:-O3 -fomit-frame-pointer -mcpu=ultrasparc -Wall -DB_ENDIAN -DULTRASPARC:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8plus-gcc.o:::asm/md5-sparcv8plus.o:",

+"solaris-usparc-oldgcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DULTRASPARC:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8plus-gcc.o:::asm/md5-sparcv8plus.o:",

 "debug-solaris-sparc-gcc","gcc:-O3 -g -mv8 -Wall -DB_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:::",
 "debug-solaris-usparc-gcc","gcc:-O3 -g -mcpu=ultrasparc -Wall -DB_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8plus-gcc.o::",
 
 "debug-solaris-sparc-gcc","gcc:-O3 -g -mv8 -Wall -DB_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:::",
 "debug-solaris-usparc-gcc","gcc:-O3 -g -mcpu=ultrasparc -Wall -DB_ENDIAN:-D_REENTRANT:-lsocket -lnsl:BN_LLONG RC4_CHAR DES_UNROLL BF_PTR:asm/sparcv8plus-gcc.o::",
 

diff --git a/config b/config
index 428fe62cbe6c6195d96bbd7f81ecb132b988186c..fe8108d4391e4997a98728a64314ab79f69d0336 100755 (executable)
--- a/config
+++ b/config
@@ -335,7 +335,7 @@ if [ "$OUT" = solaris-usparc-gcc ]
 then
  if [ `echo "$GCCVER" | sed 's/.*version //;s/\.//;s/\..*//'` -lt 28 ]
  then
 then
  if [ `echo "$GCCVER" | sed 's/.*version //;s/\.//;s/\..*//'` -lt 28 ]
  then

-  OUT=solaris-sparc-gcc
+  OUT=solaris-usparc-oldgcc

  fi
 fi
 
  fi
 fi