--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
+++ gcc/configure	Sat Sep 25 10:51:55 1999
@@ -3167,6 +3167,15 @@
  			thread_file='posix'
  		fi
 		;;
+	alpha*-*-freebsd*)
+		tm_file="${tm_file} freebsd.h alpha/freebsd.h"
+		xm_file="${xm_file} xm-freebsd.h"
+		target_cpu_default="MASK_GAS"
+		tmake_file="t-freebsd alpha/t-crtbe"
+		xmake_file=none
+		fixincludes=fixinc.wrap
+		gas=yes gnu_ld=yes
+		;;
 	alpha*-*-netbsd*)
 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
 		target_cpu_default="MASK_GAS"
@@ -3772,8 +3781,12 @@
 # Next line turned off because both 386BSD and BSD/386 use GNU ld.
 #		use_collect2=yes
 		;;
-	i[34567]86-*-freebsdelf*)
-		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
+		tm_file=i386/freebsd-aout.h
+		tmake_file=t-freebsd
+		;;
+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h"
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		tmake_file=t-freebsd
 		gas=yes
@@ -3782,13 +3795,9 @@
 		case x${enable_threads} in
 		xyes | xpthreads | xposix)
 			thread_file='posix'
-			tmake_file="${tmake_file} t-openbsd-thread"
+			tmake_file="${tmake_file} t-freebsd-thread"
 			;;
 		esac
-		;;
-	i[34567]86-*-freebsd*)
-		tm_file=i386/freebsd.h
-		tmake_file=t-freebsd
 		;;
 	i[34567]86-*-netbsd*)
 		tm_file=i386/netbsd.h