summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-05-04 23:18:24 +0000
committerUlf Möller <ulf@openssl.org>1999-05-04 23:18:24 +0000
commit744029c15470a6b16e9645a16c76bbff15be7596 (patch)
tree0b873d409a340be53d3508ca092ee2fd073ff4a7
parentef0a5354850becf858617d5ec62f440b51bda225 (diff)
Recognise Ultra Sparc and compiler version number.
-rwxr-xr-xConfigure1
-rwxr-xr-xconfig11
-rw-r--r--crypto/bn/Makefile.ssl3
3 files changed, 14 insertions, 1 deletions
diff --git a/Configure b/Configure
index 3d10d406f9..eff6b1e42b 100755
--- a/Configure
+++ b/Configure
@@ -106,6 +106,7 @@ my %table=(
# Solaris setups
"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:-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:::",
# DO NOT use /xO[34] on sparc with SC3.0. It is broken, and will not pass the tests
diff --git a/config b/config
index eec90a3456..e8cde735dd 100755
--- a/config
+++ b/config
@@ -283,6 +283,14 @@ if [ $? = "0" ]; then
CC=gcc
else
CC=cc
+ if [ "$SYSTEM" = "SunOS" ]
+ then
+ case `cc -V 2>&1` in
+ *4*) CC=sc4;;
+ *5*) CC=sc5;;
+ *) CC=cc;;
+ esac
+ fi
fi
# read the output of the embedded GuessOS
@@ -298,6 +306,7 @@ case "$GUESSOS" in
ppc-*-linux2) OUT="linux-ppc" ;;
*-*-linux2) OUT="linux-elf" ;;
*-*-linux1) OUT="linux-aout" ;;
+ sun4u-sun-solaris2) OUT="solaris-usparc-$CC" ;;
sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
*86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
*-*-sunos4) OUT="sunos-$CC" ;;
@@ -374,6 +383,6 @@ if [ $? = "0" ]; then
$PERL ./Configure $OUT $options
fi
else
- echo "This system is not supported. See file INSTALL for details."
+ echo "This system ($OUT) is not supported. See file INSTALL for details."
fi
)
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index b712031f17..347565d7b8 100644
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -102,6 +102,9 @@ asm/sparcv8.o: asm/sparcv8.S
asm/sparcv8plus.o: asm/sparcv8plus.S
+asm/sparcv8plus-gcc.o: asm/sparcv8plus.S
+ gcc -E asm/sparcv8plus.S | as -xarch=v8plus /dev/fd/0 -o asm/sparcv8plus-gcc.o
+
# MIPS 64 bit assember
asm/mips3.o: asm/mips3.s
/usr/bin/as -mips3 -O2 -o asm/mips3.o asm/mips3.s