X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=config;h=98f6d9fdc7c4a74d33c1b0c420d042391eb0dc52;hp=a2a56754a07426127461686590b31f91428e5ed3;hb=78df5a2f1e050c7d1f16c549c82bd3ee7057fe6c;hpb=59b846c5156772a5ee556212dfd63e1988aed532 diff --git a/config b/config index a2a56754a0..98f6d9fdc7 100755 --- a/config +++ b/config @@ -23,6 +23,7 @@ PREFIX="" SUFFIX="" TEST="false" +EXE="" # pick up any command line args to config for i @@ -75,9 +76,9 @@ if [ "x$XREL" != "x" ]; then ;; 4.2MP) case "x${VERSION}" in - x2.0*) echo "${MACHINE}-whatever-unixware20"; exit 0 ;; - x2.1*) echo "${MACHINE}-whatever-unixware21"; exit 0 ;; - x2*) echo "${MACHINE}-whatever-unixware2"; exit 0 ;; + x2.0*) echo "whatever-whatever-unixware20"; exit 0 ;; + x2.1*) echo "whatever-whatever-unixware21"; exit 0 ;; + x2*) echo "whatever-whatever-unixware2"; exit 0 ;; esac ;; 4.2) @@ -110,12 +111,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "m68k-apple-aux3"; exit 0 ;; - AIX:[3456789]:4:*) - echo "${MACHINE}-ibm-aix43"; exit 0 - ;; - - AIX:*:[56789]:*) - echo "${MACHINE}-ibm-aix43"; exit 0 + AIX:*:[5-9]:*) + echo "${MACHINE}-ibm-aix5"; exit 0 ;; AIX:*) @@ -134,7 +131,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "$HPUXVER" in 1[0-9].*) # HPUX 10 and 11 targets are unified - echo "${MACHINE}-hp-hpux10"; exit 0 + echo "${MACHINE}-hp-hpux1x"; exit 0 ;; *) echo "${MACHINE}-hp-hpux"; exit 0 @@ -288,6 +285,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-whatever-sysv4"; exit 0 ;; + VOS:*:*:i786) + echo "i386-stratus-vos"; exit 0 + ;; + + VOS:*:*:*) + echo "hppa1.1-stratus-vos"; exit 0 + ;; + *:4*:R4*:m88k) echo "${MACHINE}-whatever-sysv4"; exit 0 ;; @@ -410,9 +415,10 @@ if [ "$SYSTEM" = "HP-UX" ];then GCC_BITS="32" if [ $GCCVER -ge 30 ]; then # PA64 support only came in with gcc 3.0.x. - # We look for the preprocessor symbol __LP64__ indicating - # 64bit bit long and pointer. sizeof(int) == 32 on HPUX64. - if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then + # We check if the preprocessor symbol __LP64__ is defined... + if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then + : # __LP64__ has slipped through, it therefore is not defined + else GCC_BITS="64" fi fi @@ -458,7 +464,7 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then fi if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc - (cc) 2>&1 | grep -iv "command not found" > /dev/null && CC=cc + (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc fi CCVER=${CCVER:-0} @@ -473,7 +479,7 @@ echo Operating system: $GUESSOS # more time that I want to waste at the moment case "$GUESSOS" in mips2-sgi-irix) - CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` CPU=${CPU:-0} if [ $CPU -ge 4000 ]; then options="$options -mips2" @@ -481,7 +487,7 @@ case "$GUESSOS" in OUT="irix-$CC" ;; mips3-sgi-irix) - CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` CPU=${CPU:-0} if [ $CPU -ge 5000 ]; then options="$options -mips4" @@ -497,7 +503,7 @@ case "$GUESSOS" in echo " You have about 5 seconds to press Ctrl-C to abort." (stty -icanon min 0 time 50; read waste) < /dev/tty fi - CPU=`(hinv -t cpu) 2>/dev/null | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` + CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` CPU=${CPU:-0} if [ $CPU -ge 5000 ]; then options="$options -mips4" @@ -536,10 +542,7 @@ EOF ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}` rm dummy dummy.c ;; - ppc64-*-linux2) - #Use the standard target for PPC architecture until we create a - #special one for the 64bit architecture. - OUT="linux-ppc" ;; + ppc64-*-linux2) OUT="linux-ppc64" ;; ppc-*-linux2) OUT="linux-ppc" ;; m68k-*-linux*) OUT="linux-m68k" ;; ia64-*-linux?) OUT="linux-ia64" ;; @@ -641,6 +644,7 @@ EOF *-*-sunos4) OUT="sunos-$CC" ;; alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;; + ia64-*-freebsd*) OUT="FreeBSD-ia64" ;; *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; *-freebsd[1-2]*) OUT="FreeBSD" ;; *86*-*-netbsd) OUT="NetBSD-x86" ;; @@ -659,8 +663,8 @@ EOF hppa*-*-openbsd) OUT="OpenBSD-hppa" ;; *-*-openbsd) OUT="OpenBSD" ;; *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; - *-*-osf) OUT="alphaold-cc" ;; - *-*-tru64) OUT="alpha-cc" ;; + *-*-osf) OUT="osf1-alpha-cc" ;; + *-*-tru64) OUT="tru64-alpha-cc" ;; *-*-OpenUNIX*) if [ "$CC" = "gcc" ]; then OUT="OpenUNIX-8-gcc" @@ -677,19 +681,16 @@ EOF *-*-UnixWare21*) OUT="unixware-2.1" ;; *-*-Unixware20*) OUT="unixware-2.0" ;; *-*-Unixware21*) OUT="unixware-2.1" ;; + *-*-vos) + options="$options no-threads no-shared no-asm no-dso" + EXE=".pm" + OUT="vos-$CC" ;; BS2000-siemens-sysv4) OUT="BS2000-OSD" ;; RM*-siemens-sysv4) OUT="ReliantUNIX" ;; *-siemens-sysv4) OUT="SINIX" ;; *-hpux1*) - if [ $CC = "gcc" ]; - then - if [ $GCC_BITS = "64" ]; then - OUT="hpux64-parisc-gcc" - else - OUT="hpux-parisc-gcc" - fi - else - OUT="hpux-parisc-$CC" + if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then + OUT="hpux64-parisc2-gcc" fi KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null` KERNEL_BITS=${KERNEL_BITS:-32} @@ -706,9 +707,7 @@ EOF fi OUT="hpux64-ia64-cc" elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU - if [ "$CC" = "cc" ]; then - OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc? - fi + OUT=${OUT:-"hpux-parisc2-${CC}"} if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then echo "WARNING! If you wish to build 64-bit library then you have to" echo " invoke './Configure hpux64-parisc2-cc' *manually*." @@ -718,14 +717,43 @@ EOF fi fi elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU - : + OUT="hpux-parisc-${CC} elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU - : + OUT="hpux-parisc-${CC} else # Motorola(?) CPU OUT="hpux-$CC" fi options="$options -D_REENTRANT" ;; *-hpux) OUT="hpux-parisc-$CC" ;; + *-aix5) + KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null` + KERNEL_BITS=${KERNEL_BITS:-32} + if [ $KERNEL_BITS -eq 64 ]; then + # we default to 64-bit because PKI performance is >3x better... + OBJECT_MODE=${OBJECT_MODE:-$KERNEL_BITS} + else + OBJECT_MODE=32 + fi + OUT="aix-cc" + if [ "$CC" = "cc" -a $OBJECT_MODE -eq 64 ]; then + OUT="aix64-cc" + echo "WARNING! If you wish to build 32-bit kit, then you have to" + echo " invoke './Configure aix-cc' *manually*." + if [ "$TEST" = "false" ]; then + echo " You have ~5 seconds to press Ctrl-C to abort." + (stty -icanon min 0 time 50; read waste) < /dev/tty + fi + elif [ "$CC" = "gcc" ]; then + OUT="aix-gcc" + fi + ;; + *-aix) + if [ "$CC" = "gcc" ]; then + OUT="aix-gcc" + else + OUT="aix43-cc" + fi + ;; # these are all covered by the catchall below # *-aix) OUT="aix-$CC" ;; # *-dgux) OUT="dgux" ;; @@ -753,9 +781,10 @@ esac # gcc < 2.8 does not support -mcpu=ultrasparc if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] then - echo "WARNING! Do consider upgrading to gcc-2.8 or later." + echo "WARNING! Falling down to 'solaris-sparcv8-gcc'." + echo " Upgrade to gcc-2.8 or later." sleep 5 - OUT=solaris-sparcv9-gcc27 + OUT=solaris-sparcv8-gcc fi if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] then @@ -804,8 +833,8 @@ fi if [ ".$PERL" = . ] ; then for i in . `echo $PATH | sed 's/:/ /g'`; do - if [ -f "$i/perl5" ] ; then - PERL="$i/perl5" + if [ -f "$i/perl5$EXE" ] ; then + PERL="$i/perl5$EXE" break; fi; done @@ -813,9 +842,9 @@ fi if [ ".$PERL" = . ] ; then for i in . `echo $PATH | sed 's/:/ /g'`; do - if [ -f "$i/perl" ] ; then - if "$i/perl" -e 'exit($]<5.0)'; then - PERL="$i/perl" + if [ -f "$i/perl$EXE" ] ; then + if "$i/perl$EXE" -e 'exit($]<5.0)'; then + PERL="$i/perl$EXE" break; fi; fi;