X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=config;h=8e7e39afcab52025fc6d926532f43f01ca4f588e;hp=969c94d2b0f2a00b34dd7c249a8c17dd4a885282;hb=458d356db93f8d06f52cc730c94e39758267b5b7;hpb=b82ccbb7a02223de4fb78633ce8d3d974105d602 diff --git a/config b/config index 969c94d2b0..8e7e39afca 100755 --- a/config +++ b/config @@ -27,6 +27,7 @@ RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" + # Now test for ISC and SCO, since it is has a braindamaged uname. # # We need to work around FreeBSD 1.1.5.1 @@ -50,6 +51,8 @@ if [ "x$XREL" != "x" ]; then 4.2MP) if [ "x$VERSION" = "x2.1.1" ]; then echo "${MACHINE}-whatever-unixware211"; exit 0 + elif [ "x$VERSION" = "x2.1.2" ]; then + echo "${MACHINE}-whatever-unixware212"; exit 0 else echo "${MACHINE}-whatever-unixware2"; exit 0 fi @@ -57,12 +60,21 @@ if [ "x$XREL" != "x" ]; then 4.2) echo "whatever-whatever-unixware1"; exit 0 ;; + 5) + if [ "`echo x$VERSION | sed -e 's/\..*//'`" = "x7" ]; then + echo "${MACHINE}-sco-unixware7"; exit 0 + fi + ;; esac fi fi # Now we simply scan though... In most cases, the SYSTEM info is enough # case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in + MPE/iX:*) + MACHINE=`echo "$MACHINE" | sed -e 's/-/_/g'` + echo "parisc-hp-MPE/iX"; exit 0 + ;; A/UX:*) echo "m68k-apple-aux3"; exit 0 ;; @@ -156,7 +168,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in ;; NetBSD:*:*:*386*) - echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-netbsd"; exit 0 + echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0 ;; NetBSD:*) @@ -173,11 +185,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in QNX:*) case "$VERSION" in - 423) - echo "${MACHINE}-qssl-qnx32" + 4*) + echo "${MACHINE}-whatever-qnx4" ;; *) - echo "${MACHINE}-qssl-qnx" + echo "${MACHINE}-whatever-qnx" ;; esac exit 0 @@ -187,8 +199,12 @@ 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 + echo "${MACHINE}-whatever-solaris2"; exit 0 ;; SunOS:*) @@ -235,6 +251,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-v11-${SYSTEM}"; exit 0; ;; + NEWS-OS:4.*) + echo "mips-sony-newsos4"; exit 0; + ;; + esac # @@ -311,7 +331,7 @@ else fi if [ "$SYSTEM" = "SunOS" ]; then - # assume output is "blah-blah C x.x" + # 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/'` @@ -328,6 +348,19 @@ if [ "$SYSTEM" = "SunOS" ]; then 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 + GCCVER=${GCCVER:-0} CCVER=${CCVER:-0} @@ -340,9 +373,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} @@ -369,6 +399,40 @@ 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?) + cat >dummy.c < /* for printf() prototype */ + int main (argc, argv) int argc; char *argv[]; { +#ifdef __MIPSEB__ + printf ("linux-%s\n", argv[1]); +#endif +#ifdef __MIPSEL__ + printf ("linux-%sel\n", argv[1]); +#endif + return 0; +} +EOF + ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}` + rm dummy dummy.c + ;; + ppc-*-linux2) OUT="linux-ppc" ;; + m68k-*-linux*) OUT="linux-m68k" ;; + ia64-*-linux?) OUT="linux-ia64" ;; + ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; sparc64-*-linux2) #Before we can uncomment following lines we have to wait at least #till 64-bit glibc for SPARC is operational:-( @@ -385,9 +449,10 @@ case "$GUESSOS" in sun4d) OUT="linux-sparcv8" ;; *) OUT="linux-sparcv7" ;; esac ;; + arm*-*-linux2) OUT="linux-elf-arm" ;; *-*-linux2) OUT="linux-elf" ;; *-*-linux1) OUT="linux-aout" ;; - sun4u*-sun-solaris2) + sun4u*-*-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" @@ -396,10 +461,10 @@ case "$GUESSOS" in 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" ;; + sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;; + sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;; + sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;; + *86*-*-solaris2) OUT="solaris-x86-$CC" ;; *-*-sunos4) OUT="sunos-$CC" ;; alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; @@ -413,17 +478,37 @@ case "$GUESSOS" in *-*-openbsd) OUT="OpenBSD" ;; *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; *-*-osf) OUT="alpha-cc" ;; - *-*-unixware*) OUT="unixware-2.0" ;; + *-*-unixware7) OUT="unixware-7" ;; + *-*-UnixWare7) OUT="unixware-7" ;; + *-*-Unixware7) OUT="unixware-7" ;; + *-*-unixware[1-2]*) OUT="unixware-2.0" ;; + *-*-UnixWare[1-2]*) OUT="unixware-2.0" ;; + *-*-Unixware[1-2]*) 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" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac +# NB: This atalla support has been superceded by the ENGINE support +# That contains its own header and definitions anyway. Support can +# be enabled or disabled on any supported platform without external +# headers, eg. by adding the "hw-atalla" switch to ./config or +# perl Configure +# +# 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-sparcv9-gcc -a $GCCVER -lt 28 ] then @@ -438,14 +523,6 @@ then sleep 5 OUT=linux-sparcv8 fi -if [ "$OUT" = "i86pc-sun-solaris2" ] -then - ASM=`as -V /dev/null` - 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" ;; @@ -492,14 +569,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