Sync with lang/gcc.

3 files changed, 94 insertions, 93 deletions

diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index b8d88b78ee5..84fbf1fe8a3 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/03/05 06:13:21 jmc Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/28 13:57:17 kent Exp $
 
 DISTNAME=		gcc-2.95.3
 GCC_VERSION=		2.95.3
@@ -18,27 +18,20 @@ DISTFILES+=		${DISTNAME}.tar.gz ${SSP_PATCH}
 PATCHDIR=		../gcc/patches
 GCC_FILESDIR=		${FILESDIR}/../../gcc/files
 
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
 # Please let me know what platforms this package works or doesn't work on.
 #ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc
 #
 # Build error for NetBSD/alpha
-NOT_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-powerpc NetBSD-*-macppc \
+NOT_FOR_PLATFORM=	NetBSD-*-alpha \
+			NetBSD-*-powerpc NetBSD-*-macppc \
 			NetBSD-*-prep NetBSD-*-bebox NetBSD-*-ofppc \
 			NetBSD-*-amigappc NetBSD-*-sandpoint
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
-MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}elf
-.else
-MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
-.endif
+BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
-CONFIGURE_ARGS=		--host=${MACHINE_GCC_PLATFORM} \
+CONFIGURE_ARGS=		--host=${MACHINE_GNU_PLATFORM} \
 			--prefix=${GCC_PREFIX} \
 			--enable-shared
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
@@ -46,7 +39,7 @@ INFO_FILES=		# Not instal info files.
 
 MESSAGE_SUBST+=		MAKE=${MAKE} \
 			PKGBASENAME=${PKGBASENAME}
-PLIST_SUBST+=		MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM} \
+PLIST_SUBST+=		MACHINE_GCC_PLATFORM=${MACHINE_GNU_PLATFORM} \
 			PKGBASENAME=${PKGBASENAME}
 SRCDIR=			${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/objdir
@@ -57,10 +50,6 @@ WRKSRC=			${WRKDIR}/objdir
 CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
 
 GCC_PREFIX=		${LOCALBASE}/${PKGBASENAME}
-.if ${MACHINE_PLATFORM:MNetBSD-*-sparc}
-PLIST_SRC=		${PKGDIR}/PLIST.NetBSD-sparc
-PLIST_SRC+=		${PKGDIR}/PLIST
-.endif
 .else
 .if (${CC} != gcc)
 ALL_TARGET=		bootstrap
@@ -68,18 +57,24 @@ ALL_TARGET=		bootstrap
 GCC_PREFIX=		${LOCALBASE}
 PLIST_SRC=		${PKGDIR}/PLIST.SunOS
 MESSAGE=		${PKGDIR}/MESSAGE.SunOS
-CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
+#CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 	cd ${WRKSRC}/../${DISTNAME}/gcc/config; \
 	${CP} ${GCC_FILESDIR}/xm-netbsd.h .; \
-	for ARCH in arm arm i386 m68k sh sparc vax; do \
+	${CP} ${GCC_FILESDIR}/xm-target64.h .; \
+	for FILE in ${GCC_FILESDIR}/*_* ; do \
+	  ARCH=`basename $${FILE} | cut -d_ -f1`; \
+	  DEST=`basename $${FILE} | sed -e "s/$${ARCH}_//"`; \
 	  ${MKDIR} $${ARCH}; \
-	  ${CP} ${GCC_FILESDIR}/$${ARCH}_netbsd-elf.h $${ARCH}/netbsd-elf.h; \
+	  ${CP} $${FILE} $${ARCH}/$${DEST}; \
 	done; \
-	${CP} ${GCC_FILESDIR}/sparc_netbsd-elf-common.h sparc/netbsd-elf-common.h
+	cd ${WRKSRC}/../${DISTNAME}; \
+	for i in gcc/config/alpha/netbsd-elf.h gcc/config/arm/t-netbsd gcc/config/mips/x-netbsd libf2c/libF77/dtime_.c libf2c/libF77/etime_.c; do \
+	  ${RM} $${i};\
+	done
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
@@ -110,13 +105,21 @@ post-build:
 
 pre-install:
 #	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} any PRE-INSTALL
+#	This is not needed because of no info.
 
 .if (${OPSYS} != SunOS)
 post-install:
-	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGBASENAME}/bin/cc
+	${RM} -f ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGBASENAME}/bin/cc
 	${LN} -s gcc ${PREFIX}/${PKGBASENAME}/bin/cc
 	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGBASENAME}.mk
 	${RM} -fr ${GCC_PREFIX}/info
+.else
+# remove empy file and directories that show up when one
+# does make install; make deinstall; make install
+post-install:
+	-cd ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include && \
+	${RM} -f fixed && \
+	${RMDIR} v7 v9
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc-ssp/PLIST.NetBSD-sparc b/lang/gcc-ssp/PLIST.NetBSD-sparc
deleted file mode 100644
index d3d0e072029..00000000000
--- a/lang/gcc-ssp/PLIST.NetBSD-sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD-sparc,v 1.1 2001/11/01 00:32:27 zuntum Exp $
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbegin.o
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbeginS.o
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtend.o
-${PKGBASENAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtendS.o
diff --git a/lang/gcc-ssp/distinfo b/lang/gcc-ssp/distinfo
index fff2553a62f..5b77c82e50c 100644
--- a/lang/gcc-ssp/distinfo
+++ b/lang/gcc-ssp/distinfo
@@ -1,71 +1,74 @@
-$NetBSD: distinfo,v 1.3 2002/01/04 05:57:21 kent Exp $
+$NetBSD: distinfo,v 1.4 2002/03/28 13:57:18 kent Exp $
 
 SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
 Size (gcc-2.95.3.tar.gz) = 12911721 bytes
 SHA1 (protector-2.95.3-2.tar.gz) = 97ff5cb082cd1cd072035365b342a55e30d638e2
 Size (protector-2.95.3-2.tar.gz) = 17026 bytes
-SHA1 (patch-aa) = 58b0bbe43ec33d869620951adf17f3b3d1d7cae6
-SHA1 (patch-ab) = 6e94571b40a4467a2ec49195eae929578ae385cb
-SHA1 (patch-ac) = 8eb86bb15d80a0c4c1694ac5f5ad9fcb509a23f4
-SHA1 (patch-ad) = 53f6d5b00e54811ae0cba6da0918c7ac33ef47f3
-SHA1 (patch-ae) = 8c258f4645b281e9fb6c463353966d7f99dce293
-SHA1 (patch-af) = 5f1beea05beba940a431b3fedd68c93090497ee2
-SHA1 (patch-ag) = 5a99e0fb14e1102e14eb65142174ab60521897ec
-SHA1 (patch-ah) = e1d0b853cf722e2e4e3ca89e89c598f1dd0a89fc
-SHA1 (patch-ai) = 761942a066722300c6ec6ad24e7720459d059aaf
-SHA1 (patch-aj) = 411dc24f223777549bbcf357e40715b3285f65ec
-SHA1 (patch-ak) = 8fd02ad352f458cf095bf59640241db7fc001d6c
-SHA1 (patch-al) = 521337e7e7cdea057728ce90340554f128efa389
-SHA1 (patch-am) = b4e1ff86321ea0469efb88d8c27e4c81d31f5d31
-SHA1 (patch-an) = 5671a6c3e241e7067dc84cb5ecc35f28c3bf0479
-SHA1 (patch-ao) = d50d4599d43618d826db5ec2bce172bb84d22a04
-SHA1 (patch-ap) = 1afe83fbb457a8bd52af1d7eba8b1e102e14b8bd
-SHA1 (patch-aq) = 3e9dc8f1db71279b3dec60113cda7d606b2cef44
-SHA1 (patch-ar) = 6931f66c7960ccf42f95ecf3eff6f71ab85b9288
-SHA1 (patch-as) = 2d5c8dc13ab3912eef7c176b4270b55de4f90cb2
-SHA1 (patch-at) = 5d1850f722950f8fe5c0c10a837be5b0b219cff0
-SHA1 (patch-au) = 76a58ce7441cfe2cbe34fb4e2df468ab7c73612b
-SHA1 (patch-av) = e29d6c130655960e8cb8813958f54cf79e198f9f
-SHA1 (patch-aw) = 89764d60cab30ccd662225d96c5eed556cd1a828
-SHA1 (patch-ax) = 5b7884595d001e72b29656fd31e67e85a519e9d3
-SHA1 (patch-ay) = 140f0bd4fdb73700df71152a76206807d4371bf0
-SHA1 (patch-az) = 7b21d67e5f2e8fcf6970311ace41d136c5e4570a
-SHA1 (patch-ba) = 26b5d269c13c23b2d0b0021a4824164e291885c3
-SHA1 (patch-bb) = 1b3f0ebc1e05e9e03d6a5727234ee419179904d9
-SHA1 (patch-bc) = 9e6641d255cab3fb96cb16eadc23d18d5d0cc4f2
-SHA1 (patch-bd) = 6f4f008b2477a4470f19baafcad45acb02d4e1a3
-SHA1 (patch-be) = 0d9081117fd2e5bae34a15710d17ab5499d291e6
-SHA1 (patch-bf) = 6f3b5cfe80905d2d10e999fa9fdc1e997eaa84d1
-SHA1 (patch-bg) = 047627fd56f11ce98cefcd707e1e85f605a63d84
-SHA1 (patch-bh) = e68e3079b32e54aeb4fa4cbbd29c35b60b23b470
-SHA1 (patch-bi) = c740a4ca2fe691d81a3572d5671663d10234c8bd
-SHA1 (patch-bj) = 8002b1130cbab87aaeb5e22411f5f3a81b5eccc7
-SHA1 (patch-bk) = f05d7bcf44cf1321a00203d7926d1dcbcc2f715f
-SHA1 (patch-bl) = 5252fa84cf4d149b56935b84e812d1ec6778c0b0
-SHA1 (patch-bm) = 2f809c2a253d7dcf2cecb625a57d869a7408262b
-SHA1 (patch-bn) = 9f7a3f3c2430b1ea4d796661d2bee25a4dc9211e
-SHA1 (patch-bo) = 88f3d4420ed166d36b08d0525bfa32860540e0bf
-SHA1 (patch-bp) = 470b76077a4c1af84418c73408a334fb88aeecfd
-SHA1 (patch-bq) = 586998a819641e3c7f13adb5775ad796061387fd
-SHA1 (patch-br) = 084a7b25a67a9b6790d6cd276c214bbc71b8fed5
-SHA1 (patch-bs) = 642475b0229c8e8304bede44685f2f4b84695da2
-SHA1 (patch-bt) = 936cbebd8bc33ff1aafe32a6b4936e2a11935345
-SHA1 (patch-bu) = 2070a2312874bd372e433b106c2a65dd373c006d
-SHA1 (patch-bv) = 6e730e66a6dbfa5bc5e540957437aff772822379
-SHA1 (patch-bw) = ece2a0010e9424299bfe35ff9d00a6e65e4f619c
-SHA1 (patch-bx) = 6f69f1609ee84f7697b46794bdafda19fc72de5b
-SHA1 (patch-by) = d6bff5f8febc9f1977dbb5b6bd130d080c83e290
-SHA1 (patch-bz) = a86748447b8175c3c6358121c09ea82276cdc9be
-SHA1 (patch-ca) = 82ce840447c02765e3e19934be8a7aad73f1388b
-SHA1 (patch-cb) = a9fb1b8a0e422b85fc400811817367d1b4f2f2ad
-SHA1 (patch-cc) = bcdbc0cadc6d9416d008ca48db61572711cbf368
-SHA1 (patch-cd) = 3f1f3f8381719f555f50badb571d6e440f7e7fe1
-SHA1 (patch-ce) = 405cf1c6c822a37532cc2e4af0e0e076f87751b6
-SHA1 (patch-cf) = 0de67345c249905c5e8c518be645b639106fd354
-SHA1 (patch-cg) = c0b0ce75ce22b63caa49f46fa676afecd9489d1b
-SHA1 (patch-ch) = 76031a61b0dab8cba715e250b82bcb4fd8e4cdac
-SHA1 (patch-ci) = 567509e55a9fdba64e2c62188bd09286a7b004c3
-SHA1 (patch-cj) = c8e7d14703d6546e5989801a6fdffaee5932165d
-SHA1 (patch-ck) = eeada159352f6a957ba8bc10f1e6d074f56aa300
-SHA1 (patch-cl) = 1ebf7761e708ca5327c7b7e0426c1544640712ac
-SHA1 (patch-cm) = 66b86c09726bed590ba80ce4d8d01a5ad71724c8
+SHA1 (patch-aa) = 92e1f8ee1bd0873417fe3768d25b0a3d5f97cb23
+SHA1 (patch-ab) = 06bf6155ace97794578a827f1ed66afed75aa8e9
+SHA1 (patch-ac) = aa4b7d81ac28b47a9f25ad8bae40c8e0c6184c97
+SHA1 (patch-ad) = 9eb1a304e432515ba62a1fc7e80920e89c30aa3d
+SHA1 (patch-ae) = 8197ce6b522b2899907ebfebf7d61ca532e4add9
+SHA1 (patch-af) = 85bd1eeffb2a84bff06be8b3cb73091b1d50bc60
+SHA1 (patch-ag) = 0c76dd4e1f83ef0e3109986df851df832a73f068
+SHA1 (patch-ah) = 664c351a65ee004c2d616e067f150e6c42db630c
+SHA1 (patch-ai) = 59dde4be91730982a3dac34dc9199db83f519831
+SHA1 (patch-aj) = 8e57bc177d850bb69546db9bd9527b64bd265ef7
+SHA1 (patch-ak) = 673a5abe55a56897f24d5c306805317cdd83baaa
+SHA1 (patch-al) = 58e6d8fa40e39acca85f1a2b00f3a36180fa14f4
+SHA1 (patch-am) = bc595b708d54d4d694fab4972b8596ca06f26039
+SHA1 (patch-an) = 75baa5521a5a775efc7ac633953996cd09d044e1
+SHA1 (patch-ao) = 9fbce4eaf53e943d040f41c8569d754af46f50f0
+SHA1 (patch-ap) = 5adcf97fd2c45c825ac7b3835aed61ef87f5255c
+SHA1 (patch-aq) = 6a377322b24ad69cb9c30bf879f2a9481907ce98
+SHA1 (patch-ar) = 4af86f853521e77bf5ce7ec0e2f840a676595330
+SHA1 (patch-as) = f0ad0f4f0b60630f414548a1dbcc5e149a5abba2
+SHA1 (patch-at) = 0711ee4a4f865861c8e2ed13681ed75077b0ca9f
+SHA1 (patch-au) = e5be9a72bc5d0b4014dae0e63c22b60608a8b56c
+SHA1 (patch-av) = f12c80d882e0e5e22fe75c53a777cdcd6d3e60be
+SHA1 (patch-aw) = 30110bd9bfc53b1c20b32f1eda7e2d4244a9627c
+SHA1 (patch-ax) = 565e0f8d6231f064113efdb7931073abdb71abc0
+SHA1 (patch-ay) = 44d40f544507c965cb2e53262eb30ed0adbf2c8c
+SHA1 (patch-az) = 13b5a91a888c071ac05dfcbb168a12264bb85d26
+SHA1 (patch-ba) = fef61bbe4735f14987e8b565daecd95550328c76
+SHA1 (patch-bb) = 01316d1ccbd33b3a4c0c2e3c98d1f3d5d4022174
+SHA1 (patch-bc) = 936862fd5bc747003f65af42f2194e2850b064f5
+SHA1 (patch-bd) = 20fe2401fe134e504660f448851489e063661cc8
+SHA1 (patch-be) = e259c828b049a06e0a2729baec9a518615863b69
+SHA1 (patch-bf) = 857f94b5f2373bd6d7e0fad322c182394819d654
+SHA1 (patch-bg) = b096fe9a643242a26e9f213e2642bc99f5361888
+SHA1 (patch-bh) = a3ede3d8c5265d7b95329aa78497b3f70c13c517
+SHA1 (patch-bi) = d8e59c50b2893cf54c784881cbafcc646c660501
+SHA1 (patch-bj) = 430907594c739b0ed548bf84d6c0c3f134b00f12
+SHA1 (patch-bk) = ef3283a97cdd6d7429ca3e36b1daf8836129d5b6
+SHA1 (patch-bl) = b484a8e3045fd8ea7442dc54e8eee19461227235
+SHA1 (patch-bm) = 5ae49b04315daf26c2c853f26086c1d079599c29
+SHA1 (patch-bn) = 24982be2cdf0d70f859187306516e7490ec97a9e
+SHA1 (patch-bo) = 024594521de09703eaf75c147af84497983f4917
+SHA1 (patch-bp) = 60e79611db9967d5e4c2cd9434ec88867ddd9383
+SHA1 (patch-bq) = 099b41d33ff6d7b064610a4557fd06d878ac08c5
+SHA1 (patch-br) = 6f468ef729144be9f528d85d1bb4c8b0ba6fd45f
+SHA1 (patch-bs) = ee00b9f0e6ca3479c05547408c59d15680ab7ea6
+SHA1 (patch-bt) = 47cd4493c6ce07087f06bc9abb6f3de1333ad56d
+SHA1 (patch-bu) = 3238d309d728407a179ac174d7f66c27a104f442
+SHA1 (patch-bv) = c509c821be24fce6df47a96f18b3ace9ded8246a
+SHA1 (patch-bw) = 88ef21fbf274e61a4b1b75b823ff545fd7ed741b
+SHA1 (patch-bx) = 8811e5739502c061d79449dc65c27dfe8ef1c03d
+SHA1 (patch-by) = 5ed0de9c7d0d519b7d904f9a0e7bb04061d9e77f
+SHA1 (patch-bz) = ea60fee95ca6d04f0e4f221a4910efc73796d255
+SHA1 (patch-ca) = 6b999fdf1d50db4224c1f14588c0bbf904d00201
+SHA1 (patch-cb) = 7ff947303bf03f5efe06e695718fbbabcbdcee7f
+SHA1 (patch-cc) = ceeb0982a1246c3b51645e95663e823b2a67b61f
+SHA1 (patch-cd) = b425d5a28e4a3a970b9ca69583017bf851f091c5
+SHA1 (patch-ce) = 0209d8bcc7066cbcbc3f6fd7155d59a8407a002e
+SHA1 (patch-cf) = 52d2f13f465e1884a7e8ce885bc748d2cb9d1132
+SHA1 (patch-cg) = 8d14dbb401a6810a140aa57f428b3b80b34d1c3b
+SHA1 (patch-ch) = 08dc43f3785ea08df9ced153e48849b683c2aabf
+SHA1 (patch-ci) = cb1c37fa20f08ed3d9baa275e2ef31fe122d9b7d
+SHA1 (patch-cj) = ba5783189ddd37d6a5a25c588e65550bc7ffe5e7
+SHA1 (patch-ck) = 8ac32470e091dc95b3d2e78ba35658dffa54f057
+SHA1 (patch-cl) = 10065e0f5b61441d60e8354fb03dbc910dfe02fd
+SHA1 (patch-cm) = 186726168753fa23de3220421d2ddf91b08c4884
+SHA1 (patch-cn) = 355ea10eaa1eb590fc64cd535595f171af2be271
+SHA1 (patch-co) = 32f5d4b2ae185518ca4768fb03785c3e7782196f
+SHA1 (patch-cp) = d0367e27fa22a63cfc573a4fb4a801b688b213c1