From: Ralf S. Engelschall Date: Sun, 8 Aug 1999 11:56:29 +0000 (+0000) Subject: Backout the following change: X-Git-Tag: OpenSSL_0_9_4~9 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=70d65fe0e0e113c91103006e7d850f073b7b0603;hp=6368c8b7d61a6cf35838aa6a076b045298721446 Backout the following change: | revision 1.109 | date: 1999/06/24 19:39:23; author: ulf; state: Exp; lines: +0 -1 | Use the same CPU recogition method for FreeBSD 3 as for the other FreeBSD | versions. (The FreeBSD and FreeBSD-elf Configure entries were identical.) Because Ulf overlooked the ELF vs. a.out difference, i.e. the two entries were _NOT_ identical! This way OpenSSL 0.9.4 at least compiles again under FreeBSD 2 and 3. For 0.9.5-dev I'll try to fix the stuff in a more general way to also allow FreeBSD 4 and other variants. --- diff --git a/Configure b/Configure index b4e69b60e7..fdad0c238c 100755 --- a/Configure +++ b/Configure @@ -211,7 +211,7 @@ my %table=( "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:", -#"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", +"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", "FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm", "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", diff --git a/config b/config index f7d4ca7e27..33ce3e4955 100755 --- a/config +++ b/config @@ -137,6 +137,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-whatever-bsdi"; exit 0 ;; + FreeBSD:3*:*:*) + echo "${MACHINE}-whatever-freebsd3"; exit 0 + ;; + FreeBSD:*:*:*386*) case `sysctl -n hw.model` in Pentium*) @@ -398,7 +402,8 @@ case "$GUESSOS" in sun4*-sun-solaris2) OUT="solaris-sparcv7-$CC" ;; *86*-sun-solaris2) OUT="solaris-x86-$CC" ;; *-*-sunos4) OUT="sunos-$CC" ;; - alpha*-*-freebsd) OUT="FreeBSD-alpha" ;; + alpha*-*-freebsd3) OUT="FreeBSD-alpha" ;; + *-freebsd3) OUT="FreeBSD-elf" ;; *-freebsd) OUT="FreeBSD" ;; *86*-*-netbsd) OUT="NetBSD-x86" ;; sun3*-*-netbsd) OUT="NetBSD-m68" ;;