Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2639,7 +2639,7 @@
 GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
 CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
 .if defined(CROSS_TOOLCHAIN)
-CROSS_HOST=		${CROSS_TOOLCHAIN:C,-.*$,,}-unknown-${OPSYS:tl}${OSREL}
+CROSS_HOST=		${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 CONFIGURE_ARGS+=	--host=${CROSS_HOST}
 .endif
 CONFIGURE_ENV+=		CONFIG_SITE=${CONFIG_SITE} lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
Index: base/binutils/Makefile
===================================================================
--- base/binutils/Makefile
+++ base/binutils/Makefile
@@ -18,7 +18,8 @@
 .error Please define CROSS_SYSROOT before building
 .endif
 
-BUTARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
+TARGETARCH=	${ARCH:S/amd64/x86_64/}
+BUTARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
 
 CONFIGURE_ARGS+=	--disable-host-shared
 PREFIX=	/usr
@@ -31,6 +32,16 @@
 PLIST_SUB+=	OBJCOPY=""
 .endif
 
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+PLIST_SUB+=	I386=""
+.else
+PLIST_SUB+=	I386="@comment "
+.endif
+.if ${ARCH} == "amd64"
+PLIST_SUB+=	AMD64=""
+.else
+PLIST_SUB+=	AMD64="@comment "
+.endif
 .if ${ARCH:Mmips*}
 PLIST_SUB+=	MIPS=""
 .else
Index: base/binutils/pkg-plist
===================================================================
--- base/binutils/pkg-plist
+++ base/binutils/pkg-plist
@@ -8,6 +8,204 @@
 bin/%%BUTARGET%%-ld.bfd
 %%OBJCOPY%%bin/%%BUTARGET%%-objcopy
 bin/%%BUTARGET%%-objdump
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.x
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xbn
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xd
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xdc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xdce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xde
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xdw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xdwe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xn
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xr
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xs
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xsc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xsce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xse
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xsw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xswe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xu
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386.xwe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.x
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xbn
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xd
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xde
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdwe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xn
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xr
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xs
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xse
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xswe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xu
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xwe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.x
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xbn
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xd
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xde
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdwe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xn
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xr
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xs
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsc
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsce
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xse
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xswe
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xu
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xw
+%%I386%%%%BUTARGET%%/lib/ldscripts/elf_iamcu.xwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.x
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xbn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xd
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xdc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xdce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xde
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xdw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xdwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xr
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xs
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xsc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xsce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xse
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xsw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xswe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xu
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om.xwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.x
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xbn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xd
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xde
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xr
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xs
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xse
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xswe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xu
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.x
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xbn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xd
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xdc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xdce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xde
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xdw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xdwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xr
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xs
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xsc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xsce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xse
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xsw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xswe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xu
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om.xwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.x
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xbn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xd
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xde
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xr
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xs
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xse
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xswe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xu
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.x
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xbn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xd
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xde
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xr
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xs
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xsc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xsce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xse
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xsw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xswe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xu
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64.xwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.x
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xbn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xd
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xde
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdwe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xn
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xr
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xs
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xsc
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xsce
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xse
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xsw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xswe
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xu
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xw
+%%AMD64%%%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xwe
 %%MIPS%%%%BUTARGET%%/lib/ldscripts/elf32btsmip.x
 %%MIPS%%%%BUTARGET%%/lib/ldscripts/elf32btsmip.xbn
 %%MIPS%%%%BUTARGET%%/lib/ldscripts/elf32btsmip.xc
Index: base/gcc/Makefile
===================================================================
--- base/gcc/Makefile
+++ base/gcc/Makefile
@@ -28,7 +28,8 @@
 .error Please define CROSS_SYSROOT before building
 .endif
 
-GCC_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
+TARGETARCH=	${ARCH:S/amd64/x86_64/}
+GCC_TARGET=	${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
 
 PREFIX=		/usr
 CONFIGURE_ENV=	NM=/usr/bin/nm \
@@ -36,7 +37,7 @@
 		LD_FOR_TARGET=/usr/bin/ld \
 		NM_FOR_TARGET=/usr/bin/nm
 USES=	gmake libtool tar:xz makeinfo
-PLIST_SUB=	TARGETARCH=${ARCH} \
+PLIST_SUB=	TARGETARCH=${TARGETARCH} \
 		OPSYS=${OPSYS:tl} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
@@ -61,6 +62,18 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+PLIST_SUB+=	I386="" \
+		FLOAT_H="@comment "
+.else
+PLIST_SUB+=	I386="@comment " \
+		FLOAT_H=""
+.endif
+.if ${ARCH} == "amd64"
+PLIST_SUB+=	AMD64=""
+.else
+PLIST_SUB+=	AMD64="@comment "
+.endif
 .if ${ARCH:Mmips*}
 PLIST_SUB+=	MIPS=""
 .else
@@ -84,11 +97,11 @@
 		${WRKSRC}//gcc/Makefile.in
 
 post-install:
-	${MV} ${STAGEDIR}/usr/bin/gcov-tool ${STAGEDIR}/usr/bin/${GCC_TARGET}-gcov-tool ; \
+	${MV} -f ${STAGEDIR}/usr/bin/gcov-tool ${STAGEDIR}/usr/bin/${GCC_TARGET}-gcov-tool ; \
 	for tool in cpp gcc g++ gcov; do \
-		${MV} ${STAGEDIR}/usr/bin/$${tool} ${STAGEDIR}/usr/bin/${GCC_TARGET}-$${tool} ; \
+		${MV} -f ${STAGEDIR}/usr/bin/$${tool} ${STAGEDIR}/usr/bin/${GCC_TARGET}-$${tool} ; \
 		${LN} -sf ${GCC_TARGET}-$${tool}  ${STAGEDIR}/usr/bin/$${tool} ; \
-		${MV} ${STAGEDIR}/${MANDIR}1/$${tool}.1 ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
+		${MV} -f ${STAGEDIR}/${MANDIR}1/$${tool}.1 ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
 		${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${GCC_TARGET}-$${tool}.1 ; \
 		${LN} -sf ${GCC_TARGET}-$${tool}.1.gz ${STAGEDIR}/${MANDIR}1/$${tool}.1.gz ; \
 	done ; \
@@ -98,5 +111,8 @@
 	${LN} -sf ${GCC_TARGET}-gcc.1.gz ${STAGEDIR}/${MANDIR}1/cc.1.gz
 	${RM} -r ${STAGEDIR}/usr/share/info
 	${RM} -r ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+	${RM} ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
+.endif
 
 .include <bsd.port.mk>
Index: base/gcc/pkg-plist
===================================================================
--- base/gcc/pkg-plist
+++ base/gcc/pkg-plist
@@ -14,18 +14,76 @@
 bin/%%GCC_TARGET%%-gcc-ranlib
 bin/%%GCC_TARGET%%-gcov
 bin/%%GCC_TARGET%%-gcov-tool
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/adxintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ammintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx2intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512bwintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512cdintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512dqintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512erintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512fintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmaintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmavlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512pfintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmiintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmivlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlbwintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vldqintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avxintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmi2intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmiintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clflushoptintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clwbintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clzerointrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cpuid.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cross-stdarg.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/emmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/f16cintrin.h
+%%FLOAT_H%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fma4intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fmaintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fxsrintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ia32intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/immintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.h
 %%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/loongson.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lwpintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lzcntintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm3dnow.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm_malloc.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mwaitxintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/nmmintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pkuintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/popcntintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/prfchwintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rdseedintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rtmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/shaintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/smmintrin.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
 %%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tbmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/wmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/x86intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xopintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavecintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveoptintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavesintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xtestintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdalign.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdarg.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdatomic.h
@@ -99,6 +157,17 @@
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-spec.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-stdint.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/att.h
+%%AMD64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%.h
+%%AMD64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-opts.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-protos.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/stringop.def
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/unix.h
+%%AMD64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-tune.def
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.h
 %%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
 %%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h