X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=config;h=d9dbb76d9fa40ae3f4ec8b430ada25929badd693;hp=582a8b038c986183b6d698796b738f71d2bfb436;hb=720b590f567aeded50fa19dbc141da7d0e514c85;hpb=da8fa72f990e50b7ca5b597cb78134ce63269ca7 diff --git a/config b/config index 582a8b038c..d9dbb76d9f 100755 --- a/config +++ b/config @@ -98,7 +98,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "mips2-sgi-irix"; exit 0 ;; - IRIX:6.*) + IRIX:6.*) echo "mips3-sgi-irix"; exit 0 ;; @@ -137,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 @@ -184,6 +187,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "i860-intel-osf1"; exit 0 ;; + Rhapsody:*) + echo "ppc-apple-rhapsody"; exit 0 + ;; + SunOS:5.*) echo "${MACHINE}-sun-solaris2"; exit 0 ;; @@ -301,17 +308,40 @@ 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 + # 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 + # check for WorkShop C, expected output is "cc: 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 + +if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then + # check for Compaq C, expected output is "blah-blah C Vx.x" + CCCVER=`(ccc -V 2>&1) 2>/dev/null | \ + egrep -e '.* C V[0-9]\.[0-9]' | \ + sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'` + CCCVER=${CCCVER:-0} + if [ $CCCVER -gt 60 ]; then + CC=ccc # overrides gcc!!! well, ccc outperforms inoticeably + # only on hash routines and des, otherwise gcc (2.95) + # keeps along rather tight... fi fi @@ -327,9 +357,6 @@ echo Operating system: $GUESSOS # script above so we end up with values in vars but that would take # more time that I want to waste at the moment 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} @@ -356,10 +383,27 @@ case "$GUESSOS" in options="$options -mips4" OUT="irix-mips3-$CC" ;; + alpha-*-linux2) + ISA=`awk '/cpu model/{print$4}' /proc/cpuinfo` + case ${ISA:-generic} in + *[67]) OUT="linux-alpha+bwx-$CC" ;; + *) OUT="linux-alpha-$CC" ;; + esac + if [ "$CC" = "gcc" ]; then + case ${ISA:-generic} in + EV5|EV45) options="$options -mcpu=ev5";; + EV56|PCA56) options="$options -mcpu=ev56";; + EV6|EV67|PCA57) options="$options -mcpu=ev6";; + esac + fi + ;; + mips-*-linux?) OUT="linux-mips" ;; + ppc-*-linux2) OUT="linux-ppc" ;; + ppc-apple-rhapsody) OUT="rhapsody-ppc-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 @@ -374,12 +418,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" ;; @@ -390,28 +445,50 @@ case "$GUESSOS" in *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; *-*-osf) OUT="alpha-cc" ;; *-*-unixware*) OUT="unixware-2.0" ;; + *-*-UnixWare*) OUT="unixware-2.0" ;; BS2000-siemens-sysv4) OUT="BS2000-OSD" ;; RM*-siemens-sysv4) OUT="ReliantUNIX" ;; *-siemens-sysv4) OUT="SINIX" ;; + *-hpux1*) OUT="hpux-parisc-$CC" + options="$options -D_REENTRANT" ;; + *-hpux) OUT="hpux-parisc-$CC" ;; # these are all covered by the catchall below - # *-hpux*) OUT="hpux-$CC" ;; # *-aix) OUT="aix-$CC" ;; # *-dgux) OUT="dgux" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac +# See whether we can compile Atalla support +if [ -f /usr/include/atasi.h ] +then + options="$options -DATALLA" +fi + # 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 +# To start with $OUT is never i86pc-sun-solaris2. Secondly why +# ban *all* assembler implementation if it can't stand only one, +# SHA-0 implementation. +#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" ;; @@ -458,14 +535,14 @@ fi # compiler for the platform ... in which case we add it on # the end ... otherwise we leave it off -$PERL ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null +$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null if [ $? = "0" ]; then OUT="$OUT-$CC" fi OUT="$PREFIX$OUT" -$PERL ./Configure 2>&1 | grep "$OUT" > /dev/null +$PERL ./Configure LIST | grep "$OUT" > /dev/null if [ $? = "0" ]; then echo Configuring for $OUT