1) Revised ABI specification (baseline_symbols.txt) to go with release 3.4.1

2) Added CONFIGURE_ARGS+=--with-system-zlib logic to Makefile for
   consistency with gcc34
3) Incorporated logic from gcc3 that determines whether to add
   binutils dependency or not.
4) Eliminated hardcoded target of netbsdelf2.0 as a step toward supporting
   other architectures.

4 files changed, 43 insertions, 4 deletions

diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index 492548097fe..b954196a163 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/07/21 16:06:23 shannonjr Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/26 17:28:40 shannonjr Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
 PKGNAME=	gcc34-ada-${GCC_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,6 +25,37 @@ PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
 .include "../../mk/bsd.prefs.mk"
 
+# Determine whether to use binutils
+.if ${OPSYS} == "NetBSD"
+.  if !defined(USE_BINUTILS)
+AS_PATH:=	${AS}
+.    for _dir_ in ${PATH:C/\:/ /g}
+.      if empty(AS_PATH:M/*)
+.        if exists(${_dir_}/${AS})
+AS_PATH:=	${_dir_}/${AS}
+.        endif
+.      endif
+.    endfor
+.    if !empty(AS_PATH:M${LOCALBASE}/*)
+USE_BINUTILS=	YES
+.    else
+AS_VERSION!=	${AS} --version | ${AWK} '{	\
+	split($$3, v, /[.]/);	\
+	printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4];	\
+	exit;	\
+	}'
+USE_BINUTILS!=	${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
+.    endif
+MAKEFLAGS+=	USE_BINUTILS=${USE_BINUTILS}
+.  endif
+.endif
+.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
+DEPENDS+=	binutils>=2.14:../../devel/binutils
+CONFIGURE_ARGS+=	--with-as=${LOCALBASE}/bin/as
+CONFIGURE_ARGS+=	--with-gnu-as
+CONFIGURE_ARGS+=	--with-gnu-ld
+.endif
+
 # Ada bootstrap compiler section
 # An Ada compiler is required to build the Ada compiler. Two
 may be used:
@@ -60,11 +92,11 @@ FILES_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
 FILES_SUBST+=		PKGNAME=${PKGNAME}
 MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
 CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
-GCC_PLATFORM=		${MACHINE_GNU_ARCH}--netbsdelf2.0
 PTHREAD_OPTS+=		require native
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include
 CFLAGS+=	-I${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
+CONFIGURE_ARGS+=	--with-system-zlib
+CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--enable-threads=gnat
 GCC_DIR=	${WRKDIR}/.gcc
 
@@ -141,4 +173,5 @@ BUILDLINK_DEPMETHOD.gcc34=	build
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc34-ada/distinfo b/lang/gcc34-ada/distinfo
index 4de8a57c654..3a345c61b75 100644
--- a/lang/gcc34-ada/distinfo
+++ b/lang/gcc34-ada/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/07/21 16:06:23 shannonjr Exp $
+$NetBSD: distinfo,v 1.3 2004/07/26 17:28:40 shannonjr Exp $
 
 SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e
 Size (gcc-3.4.1.tar.bz2) = 27182385 bytes
@@ -7,6 +7,7 @@ SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
 SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6
 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0
+SHA1 (patch-ca) = 771c14ce8cdd9e631694cd19108419f4003a6c08
 SHA1 (patch-function_c) = 64398f40f62ad4c8b9c8f861b802403a4f5aa3be
 SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c
 SHA1 (patch-varasm) = 3dfe9a56ebd464d573104511e63dc3599ab5c834
diff --git a/lang/gcc34-ada/files/baseline_symbols.txt b/lang/gcc34-ada/files/baseline_symbols.txt
index c09b36176a4..70ee081a31b 100644
--- a/lang/gcc34-ada/files/baseline_symbols.txt
+++ b/lang/gcc34-ada/files/baseline_symbols.txt
@@ -602,6 +602,7 @@ FUNC:_ZNSt11range_errorC2ERKSs@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD0Ev@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD1Ev@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4
+FUNC:_ZNSt12__basic_fileIcE4fileEv@@GLIBCXX_3.4.1
 FUNC:_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4
@@ -885,6 +886,7 @@ FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@G
 FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4
 FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4
 FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4
+FUNC:_ZNSt19istreambuf_iteratorIcSt11char_traitsIcEEppEv@@GLIBCXX_3.4
 FUNC:_ZNSt5ctypeIcE13classic_tableEv@@GLIBCXX_3.4
 FUNC:_ZNSt5ctypeIcEC1EPKhbj@@GLIBCXX_3.4
 FUNC:_ZNSt5ctypeIcEC1EPiPKhbj@@GLIBCXX_3.4
@@ -1245,6 +1247,7 @@ FUNC:tanhl@@GLIBCXX_3.4
 FUNC:tanl@@GLIBCXX_3.4
 OBJECT:0:CXXABI_1.3
 OBJECT:0:GLIBCXX_3.4
+OBJECT:0:GLIBCXX_3.4.1
 OBJECT:12:_ZTIN10__cxxabiv116__enum_type_infoE@@CXXABI_1.3
 OBJECT:12:_ZTIN10__cxxabiv117__array_type_infoE@@CXXABI_1.3
 OBJECT:12:_ZTIN10__cxxabiv117__class_type_infoE@@CXXABI_1.3
diff --git a/lang/gcc34-ada/files/baseline_symbols64.txt b/lang/gcc34-ada/files/baseline_symbols64.txt
index efea379f55a..80acd4aed4e 100644
--- a/lang/gcc34-ada/files/baseline_symbols64.txt
+++ b/lang/gcc34-ada/files/baseline_symbols64.txt
@@ -602,6 +602,7 @@ FUNC:_ZNSt11range_errorC2ERKSs@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD0Ev@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD1Ev@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4
+FUNC:_ZNSt12__basic_fileIcE4fileEv@@GLIBCXX_3.4.1
 FUNC:_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4
@@ -1245,6 +1246,7 @@ FUNC:tanhl@@GLIBCXX_3.4
 FUNC:tanl@@GLIBCXX_3.4
 OBJECT:0:CXXABI_1.3
 OBJECT:0:GLIBCXX_3.4
+OBJECT:0:GLIBCXX_3.4.1
 OBJECT:104:_ZTVSt10moneypunctIcLb0EE@@GLIBCXX_3.4
 OBJECT:104:_ZTVSt10moneypunctIcLb1EE@@GLIBCXX_3.4
 OBJECT:104:_ZTVSt17moneypunct_bynameIcLb0EE@@GLIBCXX_3.4