diff options
Diffstat (limited to 'src/lib/libssl/src/config')
-rw-r--r-- | src/lib/libssl/src/config | 199 |
1 files changed, 121 insertions, 78 deletions
diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config index dde9275b76..c2f504f59e 100644 --- a/src/lib/libssl/src/config +++ b/src/lib/libssl/src/config | |||
@@ -54,6 +54,22 @@ SYSTEM=`(uname -s) 2>/dev/null` || SYSTEM="unknown" | |||
54 | VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" | 54 | VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" |
55 | 55 | ||
56 | 56 | ||
57 | |||
58 | |||
59 | |||
60 | # Check for VC++ presence first. | ||
61 | # | ||
62 | #if [ "x$MSVCDIR" != "x" -o "x$VCINSTALLDIR" != "x" ]; then | ||
63 | # perl Configure VC-WIN32 $* | ||
64 | # cmd /c ms\\do_masm.bat | ||
65 | # perl util/mk1mf.pl VC-WIN32-GMAKE >mak.tmp | ||
66 | # rm Makefile | ||
67 | # mv mak.tmp Makefile | ||
68 | # echo "Configured for VC++ using GNU make" | ||
69 | # exit 0 | ||
70 | #fi | ||
71 | # | ||
72 | |||
57 | # Now test for ISC and SCO, since it is has a braindamaged uname. | 73 | # Now test for ISC and SCO, since it is has a braindamaged uname. |
58 | # | 74 | # |
59 | # We need to work around FreeBSD 1.1.5.1 | 75 | # We need to work around FreeBSD 1.1.5.1 |
@@ -82,9 +98,9 @@ if [ "x$XREL" != "x" ]; then | |||
82 | esac | 98 | esac |
83 | ;; | 99 | ;; |
84 | 4.2) | 100 | 4.2) |
85 | echo "whatever-whatever-unixware1"; exit 0 | 101 | echo "i386-whatever-unixware1"; exit 0 |
86 | ;; | 102 | ;; |
87 | 5*) | 103 | 5) |
88 | case "x${VERSION}" in | 104 | case "x${VERSION}" in |
89 | # We hardcode i586 in place of ${MACHINE} for the | 105 | # We hardcode i586 in place of ${MACHINE} for the |
90 | # following reason. The catch is that even though Pentium | 106 | # following reason. The catch is that even though Pentium |
@@ -93,7 +109,8 @@ if [ "x$XREL" != "x" ]; then | |||
93 | # with i386 is that it makes ./config pass 386 to | 109 | # with i386 is that it makes ./config pass 386 to |
94 | # ./Configure, which in turn makes make generate | 110 | # ./Configure, which in turn makes make generate |
95 | # inefficient SHA-1 (for this moment) code. | 111 | # inefficient SHA-1 (for this moment) code. |
96 | x[678]*) echo "i586-sco-unixware7"; exit 0 ;; | 112 | x7*) echo "i586-sco-unixware7"; exit 0 ;; |
113 | x8*) echo "i586-unkn-OpenUNIX${VERSION}"; exit 0 ;; | ||
97 | esac | 114 | esac |
98 | ;; | 115 | ;; |
99 | esac | 116 | esac |
@@ -337,7 +354,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in | |||
337 | ;; | 354 | ;; |
338 | 355 | ||
339 | MINGW*) | 356 | MINGW*) |
340 | echo "${MACHINE}-whatever-mingw"; exit 0; | 357 | echo "${MACHINE}-whatever-mingw"; echo 0; |
358 | # Save fipslib path so VC++ build can find it | ||
359 | (cd /usr/local/ssl/lib ; pwd -W ) > util/fipslib_path.txt | ||
360 | # Extract _chkstk.o so VC++ can use it, to avoid __alloca link error | ||
361 | (cd ms ; ar x `gcc -print-libgcc-file-name` _chkstk.o) | ||
341 | ;; | 362 | ;; |
342 | CYGWIN*) | 363 | CYGWIN*) |
343 | case "$RELEASE" in | 364 | case "$RELEASE" in |
@@ -451,6 +472,8 @@ if [ "$SYSTEM" = "SunOS" ]; then | |||
451 | echo " patch #107357-01 or later applied." | 472 | echo " patch #107357-01 or later applied." |
452 | sleep 5 | 473 | sleep 5 |
453 | fi | 474 | fi |
475 | elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then | ||
476 | CC=sc3 | ||
454 | fi | 477 | fi |
455 | fi | 478 | fi |
456 | 479 | ||
@@ -516,23 +539,36 @@ case "$GUESSOS" in | |||
516 | #fi | 539 | #fi |
517 | OUT="irix-mips3-$CC" | 540 | OUT="irix-mips3-$CC" |
518 | ;; | 541 | ;; |
519 | ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; | ||
520 | ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; | ||
521 | i386-apple-darwin*) OUT="darwin-i386-cc" ;; | ||
522 | alpha-*-linux2) | 542 | alpha-*-linux2) |
523 | ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo` | 543 | ISA=`awk '/cpu model/{print$4}' /proc/cpuinfo` |
524 | case ${ISA:-generic} in | 544 | case ${ISA:-generic} in |
525 | *[678]) OUT="linux-alpha+bwx-$CC" ;; | 545 | *[67]) OUT="linux-alpha+bwx-$CC" ;; |
526 | *) OUT="linux-alpha-$CC" ;; | 546 | *) OUT="linux-alpha-$CC" ;; |
527 | esac | 547 | esac |
528 | if [ "$CC" = "gcc" ]; then | 548 | if [ "$CC" = "gcc" ]; then |
529 | case ${ISA:-generic} in | 549 | case ${ISA:-generic} in |
530 | EV5|EV45) options="$options -mcpu=ev5";; | 550 | EV5|EV45) options="$options -mcpu=ev5";; |
531 | EV56|PCA56) options="$options -mcpu=ev56";; | 551 | EV56|PCA56) options="$options -mcpu=ev56";; |
532 | *) options="$options -mcpu=ev6";; | 552 | EV6|EV67|PCA57) options="$options -mcpu=ev6";; |
533 | esac | 553 | esac |
534 | fi | 554 | fi |
535 | ;; | 555 | ;; |
556 | mips-*-linux?) | ||
557 | cat >dummy.c <<EOF | ||
558 | #include <stdio.h> /* for printf() prototype */ | ||
559 | int main (argc, argv) int argc; char *argv[]; { | ||
560 | #ifdef __MIPSEB__ | ||
561 | printf ("linux-%s\n", argv[1]); | ||
562 | #endif | ||
563 | #ifdef __MIPSEL__ | ||
564 | printf ("linux-%sel\n", argv[1]); | ||
565 | #endif | ||
566 | return 0; | ||
567 | } | ||
568 | EOF | ||
569 | ${CC} -o dummy dummy.c && OUT=`./dummy ${MACHINE}` | ||
570 | rm dummy dummy.c | ||
571 | ;; | ||
536 | ppc64-*-linux2) | 572 | ppc64-*-linux2) |
537 | echo "WARNING! If you wish to build 64-bit library, then you have to" | 573 | echo "WARNING! If you wish to build 64-bit library, then you have to" |
538 | echo " invoke './Configure linux-ppc64' *manually*." | 574 | echo " invoke './Configure linux-ppc64' *manually*." |
@@ -543,7 +579,11 @@ case "$GUESSOS" in | |||
543 | OUT="linux-ppc" | 579 | OUT="linux-ppc" |
544 | ;; | 580 | ;; |
545 | ppc-*-linux2) OUT="linux-ppc" ;; | 581 | ppc-*-linux2) OUT="linux-ppc" ;; |
582 | m68k-*-linux*) OUT="linux-m68k" ;; | ||
546 | ia64-*-linux?) OUT="linux-ia64" ;; | 583 | ia64-*-linux?) OUT="linux-ia64" ;; |
584 | ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;; | ||
585 | ppc-apple-darwin*) OUT="darwin-ppc-cc" ;; | ||
586 | i386-apple-darwin*) OUT="darwin-i386-cc" ;; | ||
547 | sparc64-*-linux2) | 587 | sparc64-*-linux2) |
548 | echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI" | 588 | echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI" |
549 | echo " and wish to build 64-bit library, then you have to" | 589 | echo " and wish to build 64-bit library, then you have to" |
@@ -554,18 +594,16 @@ case "$GUESSOS" in | |||
554 | fi | 594 | fi |
555 | OUT="linux-sparcv9" ;; | 595 | OUT="linux-sparcv9" ;; |
556 | sparc-*-linux2) | 596 | sparc-*-linux2) |
557 | KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo` | 597 | KARCH=`awk '/^type/{print$3}' /proc/cpuinfo` |
558 | case ${KARCH:-sun4} in | 598 | case ${KARCH:-sun4} in |
559 | sun4u*) OUT="linux-sparcv9" ;; | 599 | sun4u*) OUT="linux-sparcv9" ;; |
560 | sun4m) OUT="linux-sparcv8" ;; | 600 | sun4m) OUT="linux-sparcv8" ;; |
561 | sun4d) OUT="linux-sparcv8" ;; | 601 | sun4d) OUT="linux-sparcv8" ;; |
562 | *) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; | 602 | *) OUT="linux-sparcv7" ;; |
563 | esac ;; | 603 | esac ;; |
564 | parisc*-*-linux2) | 604 | parisc-*-linux2) |
565 | # 64-bit builds under parisc64 linux are not supported and | 605 | CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo` |
566 | # compiler is expected to generate 32-bit objects... | 606 | CPUSCHEDULE=`awk '/^cpu.[ ]: PA/{print substr($3,3)}' /proc/cpuinfo` |
567 | CPUARCH=`awk '/cpu family/{print substr($5,1,3); exit(0);}' /proc/cpuinfo` | ||
568 | CPUSCHEDULE=`awk '/^cpu.[ ]*: PA/{print substr($3,3); exit(0);}' /proc/cpuinfo` | ||
569 | 607 | ||
570 | # ??TODO ?? Model transformations | 608 | # ??TODO ?? Model transformations |
571 | # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off | 609 | # 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off |
@@ -578,34 +616,31 @@ case "$GUESSOS" in | |||
578 | # PA8500 -> 8000 (2.0) | 616 | # PA8500 -> 8000 (2.0) |
579 | # PA8600 -> 8000 (2.0) | 617 | # PA8600 -> 8000 (2.0) |
580 | 618 | ||
581 | CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'` | 619 | CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'` |
582 | # Finish Model transformations | 620 | # Finish Model transformations |
583 | 621 | ||
584 | options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH" | 622 | options="$options -mschedule=$CPUSCHEDULE -march=$CPUARCH" |
585 | OUT="linux-generic32" ;; | 623 | OUT="linux-parisc" ;; |
586 | arm*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; | 624 | arm*b-*-linux2) OUT="linux-elf-arm"; options="$options -DB_ENDIAN" ;; |
587 | arm*l-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; | 625 | arm*l-*-linux2) OUT="linux-elf-arm"; options="$options -DL_ENDIAN" ;; |
588 | sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; | 626 | arm*-*-linux2) OUT="linux-elf-arm" ;; |
589 | sh*-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; | 627 | s390-*-linux2) OUT="linux-s390" ;; |
590 | m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; | 628 | s390x-*-linux?) OUT="linux-s390x" ;; |
591 | s390-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN -DNO_ASM" ;; | ||
592 | s390x-*-linux2) OUT="linux-generic64"; options="$options -DB_ENDIAN" ;; | ||
593 | x86_64-*-linux?) OUT="linux-x86_64" ;; | 629 | x86_64-*-linux?) OUT="linux-x86_64" ;; |
594 | *86-*-linux2) OUT="linux-elf" | 630 | *-*-linux2) OUT="linux-elf" |
595 | if [ "$GCCVER" -gt 28 ]; then | 631 | if [ "$GCCVER" -gt 28 ]; then |
596 | if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then | 632 | if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then |
597 | options="$options -march=pentium" | 633 | OUT="linux-pentium" |
598 | fi | 634 | fi |
599 | if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then | 635 | if grep '^model.*Pentium Pro' /proc/cpuinfo >/dev/null ; then |
600 | options="$options -march=pentiumpro" | 636 | OUT="linux-ppro" |
601 | fi | 637 | fi |
602 | if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then | 638 | if grep '^model.*K6' /proc/cpuinfo >/dev/null ; then |
603 | options="$options -march=k6" | 639 | OUT="linux-k6" |
604 | fi | 640 | fi |
605 | fi ;; | 641 | fi ;; |
606 | *-*-linux1) OUT="linux-aout" ;; | 642 | *-*-linux1) OUT="linux-aout" ;; |
607 | *-*-linux2) OUT="linux-generic32" ;; | 643 | sun4u*-*-solaris2) |
608 | sun4[uv]*-*-solaris2) | ||
609 | OUT="solaris-sparcv9-$CC" | 644 | OUT="solaris-sparcv9-$CC" |
610 | ISA64=`(isalist) 2>/dev/null | grep sparcv9` | 645 | ISA64=`(isalist) 2>/dev/null | grep sparcv9` |
611 | if [ "$ISA64" != "" ]; then | 646 | if [ "$ISA64" != "" ]; then |
@@ -648,43 +683,48 @@ case "$GUESSOS" in | |||
648 | OUT="solaris64-x86_64-$CC" | 683 | OUT="solaris64-x86_64-$CC" |
649 | else | 684 | else |
650 | OUT="solaris-x86-$CC" | 685 | OUT="solaris-x86-$CC" |
651 | if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then | ||
652 | options="$options no-sse2" | ||
653 | fi | ||
654 | fi | 686 | fi |
655 | ;; | 687 | ;; |
656 | *-*-sunos4) OUT="sunos-$CC" ;; | 688 | *-*-sunos4) OUT="sunos-$CC" ;; |
657 | 689 | alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; | |
658 | *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;; | 690 | sparc64-*-freebsd*) OUT="FreeBSD-sparc64" ;; |
659 | alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;; | 691 | ia64-*-freebsd*) OUT="FreeBSD-ia64" ;; |
660 | powerpc64-*-*bsd*) OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;; | 692 | *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; |
661 | sparc64-*-*bsd*) OUT="BSD-sparc64" ;; | 693 | *-freebsd[1-2]*) OUT="FreeBSD" ;; |
662 | ia64-*-*bsd*) OUT="BSD-ia64" ;; | 694 | *86*-*-netbsd) OUT="NetBSD-x86" ;; |
663 | amd64-*-*bsd*) OUT="BSD-x86_64" ;; | 695 | sun3*-*-netbsd) OUT="NetBSD-m68" ;; |
664 | *86*-*-*bsd*) # mimic ld behaviour when it's looking for libc... | 696 | *-*-netbsd) OUT="NetBSD-sparc" ;; |
665 | if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD | 697 | alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; |
666 | libc=/usr/lib/libc.so | 698 | *86*-*-openbsd) OUT="OpenBSD-i386" ;; |
667 | else # OpenBSD | 699 | m68k*-*-openbsd) OUT="OpenBSD-m68k" ;; |
668 | # ld searches for highest libc.so.* and so do we | 700 | m88k*-*-openbsd) OUT="OpenBSD-m88k" ;; |
669 | libc=`(ls /usr/lib/libc.so.* | tail -1) 2>/dev/null` | 701 | mips*-*-openbsd) OUT="OpenBSD-mips" ;; |
670 | fi | 702 | pmax*-*-openbsd) OUT="OpenBSD-mips" ;; |
671 | case "`(file -L $libc) 2>/dev/null`" in | 703 | powerpc*-*-openbsd) OUT="OpenBSD-powerpc" ;; |
672 | *ELF*) OUT="BSD-x86-elf" ;; | 704 | sparc64*-*-openbsd) OUT="OpenBSD-sparc64" ;; |
673 | *) OUT="BSD-x86"; options="$options no-sse2" ;; | 705 | sparc*-*-openbsd) OUT="OpenBSD-sparc" ;; |
674 | esac ;; | 706 | vax*-*-openbsd) OUT="OpenBSD-vax" ;; |
675 | *-*-*bsd*) OUT="BSD-generic32" ;; | 707 | hppa*-*-openbsd) OUT="OpenBSD-hppa" ;; |
676 | 708 | *-*-openbsd) OUT="OpenBSD" ;; | |
677 | *-*-osf) OUT="osf1-alpha-cc" ;; | 709 | *86*-*-bsdi4) OUT="bsdi-elf-gcc" ;; |
678 | *-*-tru64) OUT="tru64-alpha-cc" ;; | 710 | *-*-osf) OUT="alphaold-cc" ;; |
679 | *-*-[Uu]nix[Ww]are7) | 711 | *-*-tru64) OUT="alpha-cc" ;; |
712 | *-*-OpenUNIX*) | ||
680 | if [ "$CC" = "gcc" ]; then | 713 | if [ "$CC" = "gcc" ]; then |
681 | OUT="unixware-7-gcc" ; options="$options no-sse2" | 714 | OUT="OpenUNIX-8-gcc" |
682 | else | 715 | else |
683 | OUT="unixware-7" ; options="$options no-sse2 -D__i386__" | 716 | OUT="OpenUNIX-8" |
684 | fi | 717 | fi |
685 | ;; | 718 | ;; |
686 | *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0"; options="$options no-sse2 no-sha512" ;; | 719 | *-*-unixware7) OUT="unixware-7" ;; |
687 | *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1"; options="$options no-sse2 no-sha512" ;; | 720 | *-*-UnixWare7) OUT="unixware-7" ;; |
721 | *-*-Unixware7) OUT="unixware-7" ;; | ||
722 | *-*-unixware20*) OUT="unixware-2.0" ;; | ||
723 | *-*-unixware21*) OUT="unixware-2.1" ;; | ||
724 | *-*-UnixWare20*) OUT="unixware-2.0" ;; | ||
725 | *-*-UnixWare21*) OUT="unixware-2.1" ;; | ||
726 | *-*-Unixware20*) OUT="unixware-2.0" ;; | ||
727 | *-*-Unixware21*) OUT="unixware-2.1" ;; | ||
688 | *-*-vos) | 728 | *-*-vos) |
689 | options="$options no-threads no-shared no-asm no-dso" | 729 | options="$options no-threads no-shared no-asm no-dso" |
690 | EXE=".pm" | 730 | EXE=".pm" |
@@ -693,8 +733,15 @@ case "$GUESSOS" in | |||
693 | RM*-siemens-sysv4) OUT="ReliantUNIX" ;; | 733 | RM*-siemens-sysv4) OUT="ReliantUNIX" ;; |
694 | *-siemens-sysv4) OUT="SINIX" ;; | 734 | *-siemens-sysv4) OUT="SINIX" ;; |
695 | *-hpux1*) | 735 | *-hpux1*) |
696 | if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then | 736 | if [ $CC = "gcc" ]; |
737 | then | ||
738 | if [ $GCC_BITS = "64" ]; then | ||
697 | OUT="hpux64-parisc2-gcc" | 739 | OUT="hpux64-parisc2-gcc" |
740 | else | ||
741 | OUT="hpux-parisc-gcc" | ||
742 | fi | ||
743 | else | ||
744 | OUT="hpux-parisc-$CC" | ||
698 | fi | 745 | fi |
699 | KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null` | 746 | KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null` |
700 | KERNEL_BITS=${KERNEL_BITS:-32} | 747 | KERNEL_BITS=${KERNEL_BITS:-32} |
@@ -711,7 +758,9 @@ case "$GUESSOS" in | |||
711 | fi | 758 | fi |
712 | OUT="hpux64-ia64-cc" | 759 | OUT="hpux64-ia64-cc" |
713 | elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU | 760 | elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU |
714 | OUT=${OUT:-"hpux-parisc2-${CC}"} | 761 | if [ "$CC" = "cc" ]; then |
762 | OUT="hpux-parisc2-cc" # can't we have hpux-parisc2-gcc? | ||
763 | fi | ||
715 | if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then | 764 | if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then |
716 | echo "WARNING! If you wish to build 64-bit library then you have to" | 765 | echo "WARNING! If you wish to build 64-bit library then you have to" |
717 | echo " invoke './Configure hpux64-parisc2-cc' *manually*." | 766 | echo " invoke './Configure hpux64-parisc2-cc' *manually*." |
@@ -721,9 +770,9 @@ case "$GUESSOS" in | |||
721 | fi | 770 | fi |
722 | fi | 771 | fi |
723 | elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU | 772 | elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU |
724 | OUT="hpux-parisc-${CC}" | 773 | : |
725 | elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU | 774 | elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU |
726 | OUT="hpux-parisc-${CC}" | 775 | : |
727 | else # Motorola(?) CPU | 776 | else # Motorola(?) CPU |
728 | OUT="hpux-$CC" | 777 | OUT="hpux-$CC" |
729 | fi | 778 | fi |
@@ -749,11 +798,6 @@ case "$GUESSOS" in | |||
749 | fi | 798 | fi |
750 | fi | 799 | fi |
751 | fi | 800 | fi |
752 | if (lsattr -E -O -l `lsdev -c processor|awk '{print$1;exit}'` | grep -i powerpc) >/dev/null 2>&1; then | ||
753 | : # this applies even to Power3 and later, as they return PowerPC_POWER[345] | ||
754 | else | ||
755 | options="$options no-asm" | ||
756 | fi | ||
757 | ;; | 801 | ;; |
758 | # these are all covered by the catchall below | 802 | # these are all covered by the catchall below |
759 | # *-dgux) OUT="dgux" ;; | 803 | # *-dgux) OUT="dgux" ;; |
@@ -778,13 +822,12 @@ esac | |||
778 | # options="$options -DATALLA" | 822 | # options="$options -DATALLA" |
779 | #fi | 823 | #fi |
780 | 824 | ||
781 | # gcc < 2.8 does not support -march=ultrasparc | 825 | # gcc < 2.8 does not support -mcpu=ultrasparc |
782 | if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] | 826 | if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] |
783 | then | 827 | then |
784 | echo "WARNING! Falling down to 'solaris-sparcv8-gcc'." | 828 | echo "WARNING! Do consider upgrading to gcc-2.8 or later." |
785 | echo " Upgrade to gcc-2.8 or later." | ||
786 | sleep 5 | 829 | sleep 5 |
787 | OUT=solaris-sparcv8-gcc | 830 | OUT=solaris-sparcv9-gcc27 |
788 | fi | 831 | fi |
789 | if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] | 832 | if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] |
790 | then | 833 | then |
@@ -798,7 +841,7 @@ case "$GUESSOS" in | |||
798 | i386-*) options="$options 386" ;; | 841 | i386-*) options="$options 386" ;; |
799 | esac | 842 | esac |
800 | 843 | ||
801 | for i in aes bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha | 844 | for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha |
802 | do | 845 | do |
803 | if [ ! -d crypto/$i ] | 846 | if [ ! -d crypto/$i ] |
804 | then | 847 | then |