X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=config;h=bb76191d58713e4ad0711b346d0cb32e954b7808;hp=02d7de0266173a8ebafe881fec5d869874e4ebc5;hb=2c3ee16272231986e1ff50db9c0ed68343a51fb2;hpb=4848cbf1cffcd00565c4191319030bef52cc9b55 diff --git a/config b/config index 02d7de0266..bb76191d58 100755 --- a/config +++ b/config @@ -84,7 +84,7 @@ if [ "x$XREL" != "x" ]; then 4.2) echo "whatever-whatever-unixware1"; exit 0 ;; - 5) + 5*) case "x${VERSION}" in # We hardcode i586 in place of ${MACHINE} for the # following reason. The catch is that even though Pentium @@ -93,8 +93,7 @@ if [ "x$XREL" != "x" ]; then # with i386 is that it makes ./config pass 386 to # ./Configure, which in turn makes make generate # inefficient SHA-1 (for this moment) code. - x7*) echo "i586-sco-unixware7"; exit 0 ;; - x8*) echo "i586-unkn-OpenUNIX${VERSION}"; exit 0 ;; + x[678]*) echo "i586-sco-unixware7"; exit 0 ;; esac ;; esac @@ -123,6 +122,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-ibm-aix3"; exit 0 ;; + BeOS:*:BePC) + if [ -e /boot/develop/headers/be/bone ]; then + echo "beos-x86-bone"; exit 0 + else + echo "beos-x86-r5"; exit 0 + fi + ;; + dgux:*) echo "${MACHINE}-dg-dgux"; exit 0 ;; @@ -407,7 +414,7 @@ if [ "$GCCVER" != "" ]; then CC=gcc # then strip off whatever prefix egcs prepends the number with... # Hopefully, this will work for any future prefixes as well. - GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'` + GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'` # Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion # does give us what we want though, so we use that. We just just the # major and minor version numbers. @@ -452,8 +459,6 @@ if [ "$SYSTEM" = "SunOS" ]; then echo " patch #107357-01 or later applied." sleep 5 fi - elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then - CC=sc3 fi fi @@ -520,8 +525,28 @@ case "$GUESSOS" in OUT="irix-mips3-$CC" ;; ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; - ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; - i386-apple-darwin*) OUT="darwin-i386-cc" ;; + ppc-apple-darwin*) + ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null` + if [ "$ISA64" = "1" ]; then + echo "WARNING! If you wish to build 64-bit library, then you have to" + echo " invoke './Configure darwin64-ppc-cc' *manually*." + if [ "$TEST" = "false" -a -t 1 ]; then + echo " You have about 5 seconds to press Ctrl-C to abort." + (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1 + fi + fi + OUT="darwin-ppc-cc" ;; + i386-apple-darwin*) + ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null` + if [ "$ISA64" = "1" ]; then + echo "WARNING! If you wish to build 64-bit library, then you have to" + echo " invoke './Configure darwin64-x86_86-cc' *manually*." + if [ "$TEST" = "false" -a -t 1 ]; then + echo " You have about 5 seconds to press Ctrl-C to abort." + (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1 + fi + fi + OUT="darwin-i386-cc" ;; alpha-*-linux2) ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` case ${ISA:-generic} in @@ -586,25 +611,31 @@ case "$GUESSOS" in options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH" OUT="linux-generic32" ;; - arm*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; - arm*l-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; - s390*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN -DNO_ASM" ;; + armv[1-3]*-*-linux2) OUT="linux-generic32" ;; + # -march=armv4t is expected to generate code binary compatible with + # vanilla armv4 but interoperable with armv4t. + arm*-*-linux2) OUT="linux-armv4"; options="$options -march=armv4t" ;; + sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; + sh*-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; + m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; + s390-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; + s390x-*-linux2) OUT="linux-s390x" ;; x86_64-*-linux?) OUT="linux-x86_64" ;; *86-*-linux2) OUT="linux-elf" if [ "$GCCVER" -gt 28 ]; then if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then - options="$options -mcpu=pentium" + options="$options -march=pentium" fi if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then - options="$options -mcpu=pentiumpro" + options="$options -march=pentiumpro" fi if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then - options="$options -mcpu=k6" + options="$options -march=k6" fi fi ;; *-*-linux1) OUT="linux-aout" ;; *-*-linux2) OUT="linux-generic32" ;; - sun4u*-*-solaris2) + sun4[uv]*-*-solaris2) OUT="solaris-sparcv9-$CC" ISA64=`(isalist) 2>/dev/null | grep sparcv9` if [ "$ISA64" != "" ]; then @@ -647,34 +678,43 @@ case "$GUESSOS" in OUT="solaris64-x86_64-$CC" else OUT="solaris-x86-$CC" + if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then + options="$options no-sse2" + fi fi ;; *-*-sunos4) OUT="sunos-$CC" ;; - *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; - alpha*-*-*bsd*) OUT="BSD-generic64; options="$options -DL_ENDIAN" ;; - powerpc64-*-*bsd*) OUT="BSD-generic64; options="$options -DB_ENDIAN" ;; + *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;; + alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;; + powerpc64-*-*bsd*) OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;; sparc64-*-*bsd*) OUT="BSD-sparc64" ;; ia64-*-*bsd*) OUT="BSD-ia64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; - *86*-*-*bsd*) case "`(file -L /usr/lib/libc.so.*) 2>/dev/null`" in + *86*-*-*bsd*) # mimic ld behaviour when it's looking for libc... + if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD + libc=/usr/lib/libc.so + else # OpenBSD + # ld searches for highest libc.so.* and so do we + libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null` + fi + case "`(file -L $libc) 2>/dev/null`" in *ELF*) OUT="BSD-x86-elf" ;; - *) OUT="BSD-x86" ;; + *) OUT="BSD-x86"; options="$options no-sse2" ;; esac ;; *-*-*bsd*) OUT="BSD-generic32" ;; *-*-osf) OUT="osf1-alpha-cc" ;; *-*-tru64) OUT="tru64-alpha-cc" ;; - *-*-OpenUNIX*) + *-*-[Uu]nix[Ww]are7) if [ "$CC" = "gcc" ]; then - OUT="OpenUNIX-8-gcc" + OUT="unixware-7-gcc" ; options="$options no-sse2" else - OUT="OpenUNIX-8" + OUT="unixware-7" ; options="$options no-sse2 -D__i386__" fi ;; - *-*-[Uu]nix[Ww]are7) OUT="unixware-7" ;; - *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0" ;; - *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1" ;; + *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0"; options="$options no-sse2 no-sha512" ;; + *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1"; options="$options no-sse2 no-sha512" ;; *-*-vos) options="$options no-threads no-shared no-asm no-dso" EXE=".pm" @@ -711,9 +751,9 @@ case "$GUESSOS" in fi fi elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU - OUT="hpux-parisc-${CC} + OUT="hpux-parisc-${CC}" elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU - OUT="hpux-parisc-${CC} + OUT="hpux-parisc-${CC}" else # Motorola(?) CPU OUT="hpux-$CC" fi @@ -739,6 +779,11 @@ case "$GUESSOS" in fi fi fi + if (lsattr -E -O -l `lsdev -c processor|awk '{print$1;exit}'` | grep -i powerpc) >/dev/null 2>&1; then + : # this applies even to Power3 and later, as they return PowerPC_POWER[345] + else + options="$options no-asm" + fi ;; # these are all covered by the catchall below # *-dgux) OUT="dgux" ;; @@ -748,6 +793,7 @@ case "$GUESSOS" in t3e-cray-unicosmk) OUT="cray-t3e" ;; j90-cray-unicos) OUT="cray-j90" ;; nsr-tandem-nsk) OUT="tandem-c89" ;; + beos-*) OUT="$GUESSOS" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac @@ -763,7 +809,7 @@ esac # options="$options -DATALLA" #fi -# gcc < 2.8 does not support -mcpu=ultrasparc +# gcc < 2.8 does not support -march=ultrasparc if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] then echo "WARNING! Falling down to 'solaris-sparcv8-gcc'." @@ -783,7 +829,7 @@ case "$GUESSOS" in i386-*) options="$options 386" ;; esac -for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha +for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha do if [ ! -d crypto/$i ] then