X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=config;h=c8886de4310797e10b19c0162b0ecdee64920e54;hp=21c867f438a5895c7fbb48ae62c0adc296a0c9a9;hb=335d0a4646981c9d96b62811bcfd69a96a1a67d9;hpb=74acf1c41e9110fdc82324deb75f20d6efab7bd4 diff --git a/config b/config index 21c867f438..c8886de431 100755 --- a/config +++ b/config @@ -1,27 +1,18 @@ #!/bin/sh +# Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved. # +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + # OpenSSL config: determine the operating system and run ./Configure +# Derived from minarch and GuessOS from Apache. # -# "config -h" for usage information. -# -# this is a merge of minarch and GuessOS from the Apache Group. -# Originally written by Tim Hudson . - -# Original Apache Group comments on GuessOS - -# Simple OS/Platform guesser. Similar to config.guess but -# much, much smaller. Since it was developed for use with -# Apache, it follows under Apache's regular licensing -# with one specific addition: Any changes or additions -# to this script should be Emailed to the Apache -# group (apache@apache.org) in general and to -# Jim Jagielski (jim@jaguNET.com) in specific. -# -# Be as similar to the output of config.guess/config.sub -# as possible. - +# Do "config -h" for usage information. SUFFIX="" -TEST="false" +DRYRUN="false" +VERBOSE="false" EXE="" THERE=`dirname $0` @@ -30,11 +21,13 @@ for i do case "$i" in -d*) options=$options" --debug";; --t*) TEST="true";; --h*) TEST="true"; cat < mingw64 + # MINGW32* on x86_64 => mingw + # MINGW32* on i?86 => mingw + # + # MINGW64* on i?86 isn't expected to work... + MINGW64*:*:*:x86_64) + echo "${MACHINE}-whatever-mingw64"; exit 0; + ;; MINGW*) echo "${MACHINE}-whatever-mingw"; exit 0; ;; @@ -423,19 +432,6 @@ 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 - if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc (cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc fi @@ -457,14 +453,6 @@ case "$GUESSOS" in uClinux*) OUT=uClinux-dist ;; - mips2-sgi-irix) - 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" - fi - OUT="irix-$CC" - ;; mips3-sgi-irix) #CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'` #CPU=${CPU:-0} @@ -478,7 +466,7 @@ case "$GUESSOS" in mips4-sgi-irix64) echo "WARNING! If you wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure irix64-mips4-$CC' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -497,7 +485,7 @@ case "$GUESSOS" in if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure darwin64-ppc-cc' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -511,8 +499,8 @@ case "$GUESSOS" in ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null` if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" - echo " invoke '$THERE/Configure darwin64-x86_64-cc $options' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + echo " invoke 'KERNEL_BITS=64 $THERE/config $options'." + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." # The stty technique used elsewhere doesn't work on # MacOS. At least, right now on this Mac. @@ -524,6 +512,12 @@ case "$GUESSOS" in else OUT="darwin-i386-cc" fi ;; + x86_64-apple-darwin*) + if [ "$KERNEL_BITS" = "32" ]; then + OUT="darwin-i386-cc" + else + OUT="darwin64-x86_64-cc" + fi ;; armv6+7-*-iphoneos) options="$options -arch%20armv6 -arch%20armv7" OUT="iphoneos-cross" ;; @@ -550,7 +544,7 @@ case "$GUESSOS" in if [ -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure linux-ppc64' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -567,7 +561,7 @@ case "$GUESSOS" in mips64*-*-linux2) echo "WARNING! If you wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure linux64-mips64' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -584,7 +578,7 @@ case "$GUESSOS" in echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI" echo " and wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure linux64-sparcv9' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -632,28 +626,29 @@ case "$GUESSOS" in #if egrep -e '^features.* highgprs' /proc/cpuinfo >/dev/null ; then # echo "WARNING! If you wish to build \"highgprs\" 32-bit library, then you" # echo " have to invoke './Configure linux32-s390x' *manually*." - # if [ "$TEST" = "false" -a -t -1 ]; then + # if [ "$DRYRUN" = "false" -a -t -1 ]; then # echo " You have about 5 seconds to press Ctrl-C to abort." # (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 # fi #fi OUT="linux64-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 -march=pentium" - fi - if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then - options="$options -march=pentiumpro" - fi - if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then - options="$options -march=k6" - fi + x86_64-*-linux?) + if $CC -dM -E -x c /dev/null 2>&1 | grep -q ILP32 > /dev/null; then + OUT="linux-x32" + else + OUT="linux-x86_64" + fi ;; + *86-*-linux2) + # On machines where the compiler understands -m32, prefer a + # config target that uses it + if $CC -m32 -E -x c /dev/null > /dev/null 2>&1; then + OUT="linux-x86" + else + OUT="linux-elf" fi ;; - *-*-linux1) OUT="linux-aout" ;; - *-*-linux2) OUT="linux-generic32" ;; + *86-*-linux1) OUT="linux-aout" ;; + *-*-linux?) OUT="linux-generic32" ;; sun4[uv]*-*-solaris2) OUT="solaris-sparcv9-$CC" ISA64=`(isainfo) 2>/dev/null | grep sparcv9` @@ -661,7 +656,7 @@ case "$GUESSOS" in if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure solaris64-sparcv9-cc' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -673,7 +668,7 @@ case "$GUESSOS" in OUT="solaris64-sparcv9-gcc" echo "WARNING! If you wish to build 32-bit library, then you have to" echo " invoke '$THERE/Configure solaris-sparcv9-gcc' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -681,7 +676,7 @@ case "$GUESSOS" in echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI" echo " and wish to build 64-bit library, then you have to" echo " invoke '$THERE/Configure solaris64-sparcv9-gcc' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -712,6 +707,7 @@ case "$GUESSOS" in powerpc64-*-*bsd*) OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;; sparc64-*-*bsd*) OUT="BSD-sparc64" ;; ia64-*-*bsd*) OUT="BSD-ia64" ;; + x86_64-*-dragonfly*) OUT="BSD-x86_64" ;; amd64-*-*bsd*) OUT="BSD-x86_64" ;; *86*-*-*bsd*) # mimic ld behaviour when it's looking for libc... if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD @@ -726,6 +722,9 @@ case "$GUESSOS" in esac ;; *-*-*bsd*) OUT="BSD-generic32" ;; + x86_64-*-haiku) OUT="haiku-x86_64" ;; + *-*-haiku) OUT="haiku-x86" ;; + *-*-osf) OUT="osf1-alpha-cc" ;; *-*-tru64) OUT="tru64-alpha-cc" ;; *-*-[Uu]nix[Ww]are7) @@ -762,7 +761,7 @@ case "$GUESSOS" in 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 '$THERE/Configure hpux64-parisc2-cc' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have about 5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -770,7 +769,7 @@ case "$GUESSOS" in # PA-RISC 2.0 is no longer supported as separate 32-bit # target. This is compensated for by run-time detection # in most critical assembly modules and taking advantage - # of 2.0 architectire in PA-RISC 1.1 build. + # of 2.0 architecture in PA-RISC 1.1 build. OUT="hpux-parisc1_1-${CC}" elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU OUT="hpux-parisc1_1-${CC}" @@ -799,7 +798,7 @@ case "$GUESSOS" in if [ $KERNEL_BITS -eq 64 ]; then echo "WARNING! If you wish to build 64-bit kit, then you have to" echo " invoke '$THERE/Configure aix64-cc' *manually*." - if [ "$TEST" = "false" -a -t 1 ]; then + if [ "$DRYRUN" = "false" -a -t 1 ]; then echo " You have ~5 seconds to press Ctrl-C to abort." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -865,7 +864,7 @@ case "$GUESSOS" in i386-*) options="$options 386" ;; esac -for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha +for i in aes aria bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha do if [ ! -d $THERE/crypto/$i ] then @@ -915,14 +914,19 @@ OUT="$OUT" $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null if [ $? = "0" ]; then - echo Configuring for $OUT - - if [ "$TEST" = "true" ]; then + if [ "$VERBOSE" = "true" ]; then echo $PERL $THERE/Configure $OUT $options - else + fi + if [ "$DRYRUN" = "false" ]; then $PERL $THERE/Configure $OUT $options fi else echo "This system ($OUT) is not supported. See file INSTALL for details." + exit 1 +fi + +if [ "$OUT" = "darwin64-x86_64-cc" ]; then + echo "WARNING! If you wish to build 32-bit libraries, then you have to" + echo " invoke 'KERNEL_BITS=32 $THERE/config $options'." fi )