X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=config;h=cbc2f87f11d5d23eb31c0b23b4638f3c41b93532;hp=6f36435d483baf1bb438556ac7d1aa125eed5ecd;hb=9535f8c165c07565e48e4f0212bc197ca2b17921;hpb=a0618e3e5e79f629e7818d64338d29d4a751c649 diff --git a/config b/config index 6f36435d48..cbc2f87f11 100755 --- a/config +++ b/config @@ -94,12 +94,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in esac ;; - IRIX:*) - echo "${MACHINE}-sgi-irix"; exit 0 + IRIX:5.*) + echo "mips2-sgi-irix"; exit 0 + ;; + + IRIX:6.*) + echo "mips3-sgi-irix"; exit 0 ;; IRIX64:*) - echo "${MACHINE}-sgi-irix64"; exit 0 + echo "mips4-sgi-irix64"; exit 0 ;; Linux:[2-9].*) @@ -133,20 +137,23 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-whatever-bsdi"; exit 0 ;; - FreeBSD:*:*:*386*) - case `sysctl -n hw.model` in - Pentium*) - echo "i586-whatever-freebsd"; exit 0 - ;; - *) - echo "i386-whatever-freebsd"; exit 0 - ;; - esac; - ;; - FreeBSD:*) - echo "${MACHINE}-whatever-freebsd"; exit 0 - ;; + VERS=`echo ${RELEASE} | sed -e 's/[-(].*//'` + MACH=`sysctl -n hw.model` + ARCH='whatever' + case ${MACH} in + *386* ) MACH="i386" ;; + *486* ) MACH="i486" ;; + Pentium\ II*) MACH="i686" ;; + Pentium* ) MACH="i586" ;; + Alpha* ) MACH="alpha" ;; + * ) MACH="$MACHINE" ;; + esac + case ${MACH} in + i[0-9]86 ) ARCH="pc" ;; + esac + echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0 + ;; NetBSD:*:*:*386*) echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-netbsd"; exit 0 @@ -297,20 +304,33 @@ if [ "$GCCVER" != "" ]; then CC=gcc # then strip off whatever prefix Cygnus prepends the number with... GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'` - # peak only digits before and after first dot, e.g. 2.95.1 gives 29 - GCCVER=`echo $GCCVER | sed '/\([0-9]\)\.\([0-9]\).*/\1\2/'` + # peak single digit before and after first dot, e.g. 2.95.1 gives 29 + GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` else CC=cc - if [ "$SYSTEM" = "SunOS" ] - then - case `cc -V 2>&1` in - *4*) CC=cc;; - *5*) CC=cc;; - *) CC=sc3;; - esac +fi + +if [ "$SYSTEM" = "SunOS" ]; then + # assume output is "blah-blah C x.x" + CCVER=`(cc -V 2>&1) 2>/dev/null | \ + egrep -e '^cc: .* C [0-9]\.[0-9]' | \ + sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'` + CCVER=${CCVER:-0} + if [ $CCVER -gt 40 ]; then + CC=cc # overrides gcc!!! + if [ $CCVER -eq 50 ]; then + echo "WARNING! Detected WorkShop C 5.0. Do make sure you have" + echo " patch #107357-01 or later applied." + sleep 5 + fi + elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then + CC=sc3 fi fi +GCCVER=${GCCVER:-0} +CCVER=${CCVER:-0} + # read the output of the embedded GuessOS read GUESSOS @@ -323,15 +343,41 @@ case "$GUESSOS" in alpha-*-linux2) OUT="alpha-gcc" ;; ppc-*-linux2) OUT="linux-ppc" ;; mips-*-linux?) OUT="linux-mips" ;; + mips2-sgi-irix) + CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=${CPU:-0} + if [ $CPU -ge 4000 ]; then + options="$options -mips2" + fi + OUT="irix-$CC" + ;; + mips3-sgi-irix) + CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=${CPU:-0} + if [ $CPU -ge 5000 ]; then + options="$options -mips4" + else + options="$options -mips3" + fi + OUT="irix-mips3-$CC" + ;; + mips4-sgi-irix64) + echo "WARNING! If you wish to build 64-bit library, then you have to" + echo " invoke './Configre irix64-mips4-$CC' *manually*." + echo " Type Ctrl-C if you don't want to continue." + read waste < /dev/tty + options="$options -mips4" + OUT="irix-mips3-$CC" + ;; sparc64-*-linux2) - #Before we uncomment following line we have to wait at least till - #64-bit glibc for SPARC is available:-( - #echo "WARNING! If you wish to build 64-bit library, then you have to" + #Before we can uncomment following lines we have to wait at least + #till 64-bit glibc for SPARC is operational:-( + #echo "WARNING! If you wish to build 64-bit library, then you have to" #echo " invoke './Configure linux64-sparcv9' *manually*." #echo " Type Ctrl-C if you don't want to continue." #read waste < /dev/tty OUT="linux-sparcv9" ;; - sparc-*-linux2) OUT="linux-sparc" ;; + sparc-*-linux2) KARCH=`awk '/type/{print$3}' /proc/cpuinfo` case ${KARCH:-sun4} in sun4u*) OUT="linux-sparcv9" ;; @@ -341,12 +387,23 @@ case "$GUESSOS" in esac ;; *-*-linux2) OUT="linux-elf" ;; *-*-linux1) OUT="linux-aout" ;; - sun4u-sun-solaris2) OUT="solaris-usparc-$CC" ;; - sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;; + sun4u*-sun-solaris2) + ISA64=`(isalist) 2>/dev/null | grep sparcv9` + if [ "$ISA64" != "" -a "$CC" = "cc" -a $CCVER -ge 50 ]; then + echo "WARNING! If you wish to build 64-bit library, then you have to" + echo " invoke './Configure solaris64-sparcv9-cc' *manually*." + echo " Type Ctrl-C if you don't want to continue." + read waste < /dev/tty + fi + OUT="solaris-sparcv9-$CC" ;; + sun4m-sun-solaris2) OUT="solaris-sparcv8-$CC" ;; + sun4d-sun-solaris2) OUT="solaris-sparcv8-$CC" ;; + sun4*-sun-solaris2) OUT="solaris-sparcv7-$CC" ;; *86*-sun-solaris2) OUT="solaris-x86-$CC" ;; *-*-sunos4) OUT="sunos-$CC" ;; - alpha*-*-freebsd) OUT="FreeBSD-alpha" ;; - *-freebsd) OUT="FreeBSD" ;; + alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; + *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; + *-freebsd[1-2]*) OUT="FreeBSD" ;; *86*-*-netbsd) OUT="NetBSD-x86" ;; sun3*-*-netbsd) OUT="NetBSD-m68" ;; *-*-netbsd) OUT="NetBSD-sparc" ;; @@ -368,17 +425,27 @@ case "$GUESSOS" in esac # gcc < 2.8 does not support -mcpu=ultrasparc -if [ "$OUT" = solaris-usparc-gcc -a $GCCVER -lt 28 ] +if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] then echo "WARNING! Do consider upgrading to gcc-2.8 or later." - OUT=solaris-usparc-oldgcc + sleep 5 + OUT=solaris-sparcv9-gcc27 fi if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] then echo "WARNING! Falling down to 'linux-sparcv8'." echo " Upgrade to gcc-2.8 or later." + sleep 5 OUT=linux-sparcv8 fi +if [ "$OUT" = "i86pc-sun-solaris2" ] +then + ASM=`as -V /dev/null 2>&1` + case "$ASM" in + GNU*) ;; + *) options="$options no-asm" ; echo "WARNING: You need the GNU assembler to use OpenSSL assembler code." ; echo "Sun as is not supported on Solaris x86." ;; + esac +fi case "$GUESSOS" in i386-*) options="$options 386" ;;