* configure.in: Adjust FreeBSD bits to match changes to config.guess.

        We now default to ELF for the i386, and a.out is the special case.
        * configure:  Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34518 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9ae4e51..c8c3e86 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-07  David O'Brien  <obrien@FreeBSD.org>
+
+       * configure.in:  Adjust FreeBSD bits to match changes to config.guess.
+       We now default to ELF for the i386, and a.out is the special case.
+       * configure:  Rebuilt.
+
 Tue Jun 13 10:05:30 2000  Hans-Peter Nilsson  <hp@axis.com>
 
        * final.c (final_scan_insn): Delete notes between cc0 setter and

diff --git a/gcc/configure b/gcc/configure
index 1977365..17159c6 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -4341,7 +4341,11 @@ for machine in $build $host $target; do
 # Next line turned off because both 386BSD and BSD/386 use GNU ld.
 #              use_collect2=yes
                ;;
-       i[34567]86-*-freebsdelf*)
+       i[34567]86-*-freebsd[12] | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd*aout*)
+               tm_file="i386/freebsd.h i386/perform.h"
+               tmake_file=t-freebsd
+               ;;
+       i[34567]86-*-freebsd*)
                tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h"
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                tmake_file=t-freebsd
@@ -4355,10 +4359,6 @@ for machine in $build $host $target; do
                        ;;
                esac
                ;;
-       i[34567]86-*-freebsd*)
-               tm_file="i386/freebsd.h i386/perform.h"
-               tmake_file=t-freebsd
-               ;;
        i[34567]86-*-netbsd*)
                tm_file=i386/netbsd.h
                tmake_file=t-netbsd

diff --git a/gcc/configure.in b/gcc/configure.in
index 68bd958..3061753 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1436,7 +1436,13 @@ changequote([,])dnl
 #              use_collect2=yes
                ;;
 changequote(,)dnl
-       i[34567]86-*-freebsdelf*)
+       i[34567]86-*-freebsd[12] | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd*aout*)
+changequote([,])dnl
+               tm_file="i386/freebsd.h i386/perform.h"
+               tmake_file=t-freebsd
+               ;;
+changequote(,)dnl
+       i[34567]86-*-freebsd*)
 changequote([,])dnl
                tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h"
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -1452,12 +1458,6 @@ changequote([,])dnl
                esac
                ;;
 changequote(,)dnl
-       i[34567]86-*-freebsd*)
-changequote([,])dnl
-               tm_file="i386/freebsd.h i386/perform.h"
-               tmake_file=t-freebsd
-               ;;
-changequote(,)dnl
        i[34567]86-*-netbsd*)
 changequote([,])dnl
                tm_file=i386/netbsd.h