From fa60196fd0eeed31b612d730fa69e6cb9880ac3c Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 10 Oct 1999 20:28:35 +0000
Subject: Upgrade to the 1999-09-20 development snapshot.

---
 lang/gcc34/files/alpha-freebsd.h |  2 ++
 lang/gcc34/files/patch-ak        | 22 ++++++++++++-------
 lang/gcc34/files/patch-al        | 46 +++++++++++++++++++++++-----------------
 3 files changed, 42 insertions(+), 28 deletions(-)

(limited to 'lang/gcc34/files')

diff --git a/lang/gcc34/files/alpha-freebsd.h b/lang/gcc34/files/alpha-freebsd.h
index f10b264..e34f682 100644
--- a/lang/gcc34/files/alpha-freebsd.h
+++ b/lang/gcc34/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc34/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc34/files/patch-ak b/lang/gcc34/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc34/files/patch-ak
+++ b/lang/gcc34/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- 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
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -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*)
-+		tm_file=i386/freebsd.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*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=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
diff --git a/lang/gcc34/files/patch-al b/lang/gcc34/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc34/files/patch-al
+++ b/lang/gcc34/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.h
++		tmake_file=t-freebsd
++		;;
++changequote(,)dnl
++	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		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
--		gnu_ld=yes
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,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
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		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
-+		gnu_ld=yes
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
-- 
cgit v1.1