git: 005a11536950 - main - devel/freebsd-gcc6: Retire obsolete port.

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Wed, 22 Mar 2023 18:40:42 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/ports/commit/?id=005a11536950f4031a3efbf86aa7c06c3fbfaef4

commit 005a11536950f4031a3efbf86aa7c06c3fbfaef4
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-03-22 18:40:15 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-03-22 18:40:15 +0000

    devel/freebsd-gcc6: Retire obsolete port.
    
    Supported FreeBSD versions can no longer be built with GCC 6 and
    users wishing to compile FreeBSD with GCC are encouraged to use
    devel/freebsd-gcc9 or devel/freebsd-gcc12 instead.
    
    Reviewed by:    manu, otis
    Differential Revision:  https://reviews.freebsd.org/D39218
---
 MOVED                                              |   1 +
 devel/Makefile                                     |   1 -
 devel/freebsd-gcc6/Makefile                        | 132 -------
 devel/freebsd-gcc6/distinfo                        |   3 -
 devel/freebsd-gcc6/files/patch-clang-vec_step      |  21 --
 .../files/patch-freebsd-format-extensions          | 117 ------
 devel/freebsd-gcc6/files/patch-freebsd-libdir      |  43 ---
 .../freebsd-gcc6/files/patch-gcc-config-i386-386.c |  11 -
 devel/freebsd-gcc6/files/patch-gcc-freebsd-mips    | 405 ---------------------
 devel/freebsd-gcc6/files/patch-libcpp_lex.c        |  25 --
 devel/freebsd-gcc6/files/xtoolchain.mk.in          |   5 -
 devel/freebsd-gcc6/pkg-descr                       |   2 -
 devel/freebsd-gcc6/pkg-plist                       |  18 -
 devel/freebsd-gcc6/pkg-plist.aarch64               |  10 -
 devel/freebsd-gcc6/pkg-plist.amd64                 |   3 -
 devel/freebsd-gcc6/pkg-plist.arm                   |   4 -
 devel/freebsd-gcc6/pkg-plist.common                | 397 --------------------
 devel/freebsd-gcc6/pkg-plist.i386                  |  68 ----
 devel/freebsd-gcc6/pkg-plist.mips                  |   7 -
 devel/freebsd-gcc6/pkg-plist.powerpc               |  20 -
 devel/freebsd-gcc6/pkg-plist.sparc64               |   8 -
 21 files changed, 1 insertion(+), 1300 deletions(-)

diff --git a/MOVED b/MOVED
index 0cc6fc86d07d..960b81927ef2 100644
--- a/MOVED
+++ b/MOVED
@@ -17822,3 +17822,4 @@ science/dcl||2023-03-20|Has expired: Broken since 2021
 graphics/gimp-gmic-plugin||2023-03-21|Has expired: Broken since 2021
 science/InsightToolkit521|science/InsightToolkit|2023-03-21|Retire InsightToolkit521: it was there only to support graphics/elastix
 sysutils/etcupdate||2023-03-21|Part of the base system since FreeBSD 10.0
+devel/freebsd-gcc6||2023-03-22|No longer able to build base system, use GCC 9 or later instead
diff --git a/devel/Makefile b/devel/Makefile
index a58560ec7325..f884ddc55fc5 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -700,7 +700,6 @@
     SUBDIR += fpc-zlib
     SUBDIR += fpp
     SUBDIR += freebsd-gcc12
-    SUBDIR += freebsd-gcc6
     SUBDIR += freebsd-gcc9
     SUBDIR += freebsd-git-devtools
     SUBDIR += freebsd-sysroot
diff --git a/devel/freebsd-gcc6/Makefile b/devel/freebsd-gcc6/Makefile
deleted file mode 100644
index 6adfe3abd5dc..000000000000
--- a/devel/freebsd-gcc6/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-PORTNAME=	gcc
-PORTVERSION=	6.5.0
-PORTREVISION=	3
-CATEGORIES=	devel
-MASTER_SITES=	GCC
-PKGNAMEPREFIX=	${TARGETARCH}-
-PKGNAMESUFFIX=	${SUFFIX}
-
-MAINTAINER=	jhb@FreeBSD.org
-COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
-WWW=		https://gcc.gnu.org/
-
-LICENSE=	GPLv3 GPLv3RLE
-LICENSE_COMB=	multi
-
-BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \
-		objdump:devel/binutils
-LIB_DEPENDS=	libgmp.so:math/gmp \
-		libmpfr.so:math/mpfr \
-		libmpc.so:math/mpc
-RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH}
-
-FLAVORS=	aarch64 amd64 i386 mips mips64 powerpc64 sparc64
-TARGETARCH=	${FLAVOR}
-
-USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz
-CPE_VENDOR=	gnu
-
-CONFLICTS=	${TARGETARCH}-gcc
-
-PLIST_SUB=	OPSYS=${OPSYS:tl} \
-		SUFFIX=${SUFFIX} \
-		TARGETARCH=${TARGETARCH} \
-		GCC_TARGET=${GCC_TARGET} \
-		GCC_VERSION=${PORTVERSION}
-
-SUB_FILES=	xtoolchain.mk
-SUB_LIST=	GCC_TARGET=${GCC_TARGET}
-
-GCC_TARGET=	${FLAVOR:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
-SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
-BU_PREFIX=	${GCC_TARGET}
-
-GNU_CONFIGURE=	yes
-CONFIGURE_OUTSOURCE=	yes
-CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
-		--enable-gnu-indirect-function \
-		--enable-initfini-array \
-		--program-prefix=${GCC_TARGET}- \
-		--program-suffix=${SUFFIX} \
-		--without-headers \
-		--with-gmp=${LOCALBASE} \
-		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
-		--with-system-zlib \
-		--with-gxx-include-dir=/usr/include/c++/v1/ \
-		--with-sysroot="/" \
-		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
-		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
-
-ALL_TARGET=	all-gcc
-INSTALL_TARGET=	install-gcc
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
-		${WRKSRC}//gcc/cp/g++spec.c
-	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
-		${WRKSRC}//gcc/Makefile.in
-
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
-.else
-CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
-.endif
-
-.if ${TARGETARCH} == "armv6" || ${TARGETARCH} == "aarch64"
-. if ${CHOSEN_COMPILER_TYPE} == clang
-MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
-. endif
-.endif
-
-.if ${ARCH} == "aarch64"
-PLIST_SUB+=	PLUGINS="@comment plugin does not build"
-.else
-PLIST_SUB+=	PLUGINS=""
-.endif
-
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
-PLIST_SUB+=	FLOAT_H="@comment "
-.else
-PLIST_SUB+=	FLOAT_H=""
-.endif
-
-PLIST=		${.CURDIR}/pkg-plist ${.CURDIR}/pkg-plist.common
-
-.if ${TARGETARCH} == "aarch64"
-PLIST+=		${.CURDIR}/pkg-plist.aarch64
-.endif
-.if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
-PLIST+=		${.CURDIR}/pkg-plist.arm
-.endif
-.if ${TARGETARCH} == "amd64"
-PLIST+=		${.CURDIR}/pkg-plist.amd64
-.endif
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
-PLIST+=		${.CURDIR}/pkg-plist.i386
-.endif
-.if ${TARGETARCH:Mmips*}
-PLIST+=		${.CURDIR}/pkg-plist.mips
-.endif
-.if ${TARGETARCH:Mpowerpc*}
-PLIST+=		${.CURDIR}/pkg-plist.powerpc
-.endif
-.if ${TARGETARCH} == "sparc64"
-PLIST+=		${.CURDIR}/pkg-plist.sparc64
-.endif
-
-post-install:
-	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
-	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
-	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
-	# Conflicts with sys/x86/include/float.h
-	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
-.endif
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
-	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
-		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
-
-.include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc6/distinfo b/devel/freebsd-gcc6/distinfo
deleted file mode 100644
index 170a61e6c183..000000000000
--- a/devel/freebsd-gcc6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1574290065
-SHA256 (gcc-6.5.0.tar.xz) = 7ef1796ce497e89479183702635b14bb7a46b53249209a5e0f999bebf4740945
-SIZE (gcc-6.5.0.tar.xz) = 74355588
diff --git a/devel/freebsd-gcc6/files/patch-clang-vec_step b/devel/freebsd-gcc6/files/patch-clang-vec_step
deleted file mode 100644
index 68fbeedad582..000000000000
--- a/devel/freebsd-gcc6/files/patch-clang-vec_step
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239266 reports how
-clang unfortunately poisons user namespace by default (without any
-special options).
-
-Until that changes (or GCC changes) we need to avoid using vec_step
-as a variable.
-
---- UTC
-Index: gcc/tree-vect-loop.c
-===================================================================
---- gcc/tree-vect-loop.c	(revision 273856)
-+++ gcc/tree-vect-loop.c	(working copy)
-@@ -55,6 +55,8 @@ along with GCC; see the file COPYING3.  If not see
- #include "vec-perm-indices.h"
- #include "tree-eh.h"
- 
-+#define vec_step vec_step_
-+
- /* Loop Vectorization Pass.
- 
-    This pass tries to vectorize loops.
diff --git a/devel/freebsd-gcc6/files/patch-freebsd-format-extensions b/devel/freebsd-gcc6/files/patch-freebsd-format-extensions
deleted file mode 100644
index ed211f8e2070..000000000000
--- a/devel/freebsd-gcc6/files/patch-freebsd-format-extensions
+++ /dev/null
@@ -1,117 +0,0 @@
-Index: gcc/c-family/c-format.c
-===================================================================
---- gcc/c-family/c-format.c	(revision 216017)
-+++ gcc/c-family/c-format.c	(working copy)
-@@ -622,6 +622,26 @@
-   { NULL,  0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
- };
- 
-+static const format_char_info fbsd_ext_char_info =
-+{ NULL,   1, STD_EXT, { T89_C,  BADLEN,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN, BADLEN }, "",      "cR", NULL };
-+
-+static const format_char_info fbsd_print_char_table[] =
-+{
-+  /* BSD conversion specifiers.  */
-+  /* FreeBSD kernel extensions (src/sys/kern/subr_prf.c).
-+     The format %b is supported to decode error registers.
-+     Its usage is:	printf("reg=%b\n", regval, "<base><arg>*");
-+     which produces:	reg=3<BITTWO,BITONE>
-+     The format %D provides a hexdump given a pointer and separator string:
-+     ("%6D", ptr, ":")		-> XX:XX:XX:XX:XX:XX
-+     ("%*D", len, ptr, " ")	-> XX XX XX XX ...
-+   */
-+  { "D",   1, STD_EXT, { T89_V,  BADLEN,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN }, "-wp",      "cR", &fbsd_ext_char_info },
-+  { "b",   0, STD_EXT, { T89_I,  BADLEN,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-wp",      "",   &fbsd_ext_char_info },
-+  { "ry",  0, STD_EXT, { T89_I,  BADLEN,   BADLEN,   T89_L,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-wp0 +#",  "i",  NULL  },
-+  { NULL,  0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
-+};
-+
- static const format_char_info asm_fprintf_char_table[] =
- {
-   /* C89 conversion specifiers.  */
-@@ -872,6 +892,12 @@
-     strfmon_flag_specs, strfmon_flag_pairs,
-     FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L', 0,
-     NULL, NULL
-+  },
-+  { "printf0",  printf_length_specs,  print_char_table, " +#0-'I", NULL,
-+    printf_flag_specs, printf_flag_pairs,
-+    FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK|FMT_FLAG_NULL_FORMAT_OK,
-+    'w', 0, 'p', 0, 'L', 0,
-+    &integer_type_node, &integer_type_node
-   }
- };
- 
-@@ -1426,6 +1452,9 @@
- 
-   if (integer_zerop (format_tree))
-     {
-+      if (!(format_types[info->format_type].flags & FMT_FLAG_NULL_FORMAT_OK))
-+	warning (OPT_Wformat_, "null format string");
-+
-       /* Skip to first argument to check, so we can see if this format
- 	 has any arguments (it shouldn't).  */
-       while (arg_num + 1 < info->first_arg_num)
-@@ -1926,6 +1955,14 @@
- 	  while (fli->name != 0
-  		 && strncmp (fli->name, format_chars, strlen (fli->name)))
- 	      fli++;
-+	  /*
-+	   * Make sure FreeBSD's D format char takes preference
-+	   * over new DD length specifier if FreeBSD format
-+	   * extensions are requested.
-+	   */
-+	  if (fli->index == FMT_LEN_D && flag_format_extensions
-+	    && fki->conversion_specs == print_char_table)
-+	  	while (fli->name != 0) fli++;
- 	  if (fli->name != 0)
- 	    {
-  	      format_chars += strlen (fli->name);
-@@ -1993,6 +2030,14 @@
-       while (fci->format_chars != 0
- 	     && strchr (fci->format_chars, format_char) == 0)
- 	  ++fci;
-+      if (fci->format_chars == 0 && flag_format_extensions
-+	  && fki->conversion_specs == print_char_table)
-+	{
-+	  fci = fbsd_print_char_table;
-+	  while (fci->format_chars != 0
-+		 && strchr (fci->format_chars, format_char) == 0)
-+	      ++fci;
-+	}
-       if (fci->format_chars == 0)
- 	{
- 	  if (ISGRAPH (format_char))
-Index: gcc/c-family/c-format.h
-===================================================================
---- gcc/c-family/c-format.h	(revision 216017)
-+++ gcc/c-family/c-format.h	(working copy)
-@@ -75,11 +75,12 @@
-   FMT_FLAG_DOLLAR_GAP_POINTER_OK = 128,
-   /* The format arg is an opaque object that will be parsed by an external
-      facility.  */
--  FMT_FLAG_PARSE_ARG_CONVERT_EXTERNAL = 256
-+  FMT_FLAG_PARSE_ARG_CONVERT_EXTERNAL = 256,
-   /* Not included here: details of whether width or precision may occur
-      (controlled by width_char and precision_char); details of whether
-      '*' can be used for these (width_type and precision_type); details
-      of whether length modifiers can occur (length_char_specs).  */
-+  FMT_FLAG_NULL_FORMAT_OK = 512
- };
- 
- /* Structure describing a length modifier supported in format checking, and
-Index: gcc/config/freebsd.opt
-===================================================================
---- gcc/config/freebsd.opt	(revision 216017)
-+++ gcc/config/freebsd.opt	(working copy)
-@@ -34,6 +34,10 @@
- defsym=
- Driver JoinedOrMissing
- 
-+fformat-extensions
-+Common Report Var(flag_format_extensions) Init(0)
-+Allow FreeBSD kernel-specific printf format specifiers.
-+
- posix
- Driver
- 
diff --git a/devel/freebsd-gcc6/files/patch-freebsd-libdir b/devel/freebsd-gcc6/files/patch-freebsd-libdir
deleted file mode 100644
index 12c3fcaabca0..000000000000
--- a/devel/freebsd-gcc6/files/patch-freebsd-libdir
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git gcc/config/freebsd.h gcc/config/freebsd.h
-index e7ea42370c5..191e7da2071 100644
---- gcc/config/freebsd.h
-+++ gcc/config/freebsd.h
-@@ -44,6 +44,9 @@ along with GCC; see the file COPYING3.  If not see
- #undef  LIB_SPEC
- #define LIB_SPEC FBSD_LIB_SPEC
- 
-+#undef  STARTFILE_PREFIX_SPEC
-+#define STARTFILE_PREFIX_SPEC "/usr/lib/ "
-+
- #if defined(HAVE_LD_EH_FRAME_HDR)
- #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
- #endif
-diff --git gcc/gcc.c gcc/gcc.c
-index f70755679f4..890ef20fd43 100644
---- gcc/gcc.c
-+++ gcc/gcc.c
-@@ -4298,10 +4298,12 @@ process_command (unsigned int decoded_options_count,
- 	}
- 
-       set_std_prefix (gcc_exec_prefix, len);
-+#if 0
-       add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC",
- 		  PREFIX_PRIORITY_LAST, 0, 0);
-       add_prefix (&startfile_prefixes, gcc_exec_prefix, "GCC",
- 		  PREFIX_PRIORITY_LAST, 0, 0);
-+#endif
-     }
- 
-   /* COMPILER_PATH and LIBRARY_PATH have values
-@@ -4585,9 +4587,11 @@ process_command (unsigned int decoded_options_count,
-   add_prefix (&exec_prefixes,
- 	      concat (tooldir_prefix, "bin", dir_separator_str, NULL),
- 	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
-+#if 0
-   add_prefix (&startfile_prefixes,
- 	      concat (tooldir_prefix, "lib", dir_separator_str, NULL),
- 	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
-+#endif
-   free (tooldir_prefix);
- 
- #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
diff --git a/devel/freebsd-gcc6/files/patch-gcc-config-i386-386.c b/devel/freebsd-gcc6/files/patch-gcc-config-i386-386.c
deleted file mode 100644
index 992eb7b8a04e..000000000000
--- a/devel/freebsd-gcc6/files/patch-gcc-config-i386-386.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/config/i386/i386.c.orig	2020-08-28 09:37:26.849947000 -0700
-+++ gcc/config/i386/i386.c	2020-08-28 09:37:51.260814000 -0700
-@@ -8747,7 +8747,7 @@ function_arg_advance_32 (CUMULATIVE_ARGS *cum, machine
- 			 HOST_WIDE_INT words)
- {
-   int res = 0;
--  bool error_p = NULL;
-+  bool error_p = false;
- 
-   if (TARGET_IAMCU)
-     {
diff --git a/devel/freebsd-gcc6/files/patch-gcc-freebsd-mips b/devel/freebsd-gcc6/files/patch-gcc-freebsd-mips
deleted file mode 100644
index e796cbd21f30..000000000000
--- a/devel/freebsd-gcc6/files/patch-gcc-freebsd-mips
+++ /dev/null
@@ -1,405 +0,0 @@
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 90d4f71..5a05e22 100644
---- gcc/config.gcc
-+++ gcc/config.gcc
-@@ -1949,6 +1949,26 @@ microblaze*-*-elf)
- 	cxx_target_objs="${cxx_target_objs} microblaze-c.o"
- 	tmake_file="${tmake_file} microblaze/t-microblaze"
-         ;;
-+mips*-*-freebsd*)	# FreeBSD/mips[64], either endian.
-+	tm_file="${tm_file} elfos.h ${fbsd_tm_file} mips/elf.h mips/freebsd.h"
-+	target_cpu_default="MASK_ABICALLS|MASK_SOFT_FLOAT_ABI"
-+	case ${target} in
-+		mips64*-*-freebsd*)
-+			tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64"
-+			;;
-+		mipsn32*-*-freebsd*)
-+			tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
-+			;;
-+		mips*-*-freebsd*)
-+			tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32 MIPS_ISA_DEFAULT=3"
-+			;;
-+	esac
-+	case ${target} in
-+		mips*el-*-freebsd*)
-+			tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";
-+			;;
-+	esac
-+	;;
- mips*-*-netbsd*)			# NetBSD/mips, either endian.
- 	target_cpu_default="MASK_ABICALLS"
- 	tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
-diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
-index c1d5553..5d882e3 100644
---- gcc/config/elfos.h
-+++ gcc/config/elfos.h
-@@ -198,7 +198,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define ASCII_DATA_ASM_OP	"\t.ascii\t"
- 
- /* Support a read-only data section.  */
-+#ifndef READONLY_DATA_SECTION_ASM_OP
- #define READONLY_DATA_SECTION_ASM_OP	"\t.section\t.rodata"
-+#endif
- 
- /* On svr4, we *do* have support for the .init and .fini sections, and we
-    can put stuff in there to be executed before and after `main'.  We let
-@@ -292,6 +294,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define USE_GNU_UNIQUE_OBJECT 0
- #endif
- 
-+#ifndef ASM_DECLARE_OBJECT_NAME
- #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)			\
-   do									\
-     {									\
-@@ -320,6 +323,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-       ASM_OUTPUT_LABEL (FILE, NAME);					\
-     }									\
-   while (0)
-+#endif
- 
- /* Output the size directive for a decl in rest_of_decl_compilation
-    in the case where we did not do so before the initializer.
-diff --git a/gcc/config/mips/freebsd.h b/gcc/config/mips/freebsd.h
-new file mode 100644
-index 0000000..56a921e
---- /dev/null
-+++ gcc/config/mips/freebsd.h
-@@ -0,0 +1,325 @@
-+/* Definitions for MIPS varients running FreeBSD with ELF format
-+   Copyright (C) 2008 Free Software Foundation, Inc.
-+   Continued by David O'Brien <obrien@freebsd.org>
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING.  If not, write to
-+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-+Boston, MA 02110-1301, USA.  */
-+
-+/* $FreeBSD$ */
-+
-+#undef  SUBTARGET_EXTRA_SPECS	/* mips.h bogusly defines it.  */
-+#define SUBTARGET_EXTRA_SPECS \
-+  { "fbsd_dynamic_linker",	FBSD_DYNAMIC_LINKER}, \
-+  { "fbsd_link_spec",		FBSD_LINK_SPEC }
-+
-+/* config/mips/mips.h defines CC1_SPEC,
-+   but gives us an "out" with SUBTARGET_CC1_SPEC.  */
-+#undef  SUBTARGET_CC1_SPEC
-+#define SUBTARGET_CC1_SPEC "%{profile:-p}"
-+
-+/* Provide a LINK_SPEC appropriate for FreeBSD.  Here we provide support
-+   for the special GCC options -static and -shared, which allow us to
-+   link things in one of these three modes by applying the appropriate
-+   combinations of options at link-time. We like to support here for
-+   as many of the other GNU linker options as possible. But I don't
-+   have the time to search for those flags. I am sure how to add
-+   support for -soname shared_object_name. H.J.
-+
-+   When the -shared link option is used a final link is not being
-+   done.  */
-+
-+#define FBSD_LINK_SPEC "\
-+    %{p:%nconsider using `-pg' instead of `-p' with gprof(1) } \
-+    %{v:-V} \
-+    %{assert*} %{R*} %{rpath*} %{defsym*} \
-+    %{shared:-Bshareable %{h*} %{soname*}} \
-+    %{!static:--enable-new-dtags} \
-+    %{!shared: \
-+      %{!static: \
-+	%{rdynamic: -export-dynamic} \
-+	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
-+      %{static:-Bstatic}} \
-+    %{symbolic:-Bsymbolic} "
-+
-+#undef	LINK_SPEC
-+#define LINK_SPEC "\
-+    %{EB} %{EL} %(endian_spec) \
-+    %{G*} %{mips1} %{mips2} %{mips3} %{mips4} \
-+    %{mips32} %{mips32r2} %{mips64} %{mips64r2} \
-+    %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
-+    %{mabi=32:-melf32%{EB:b}%{EL:l}tsmip_fbsd} \
-+    %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32_fbsd} \
-+    %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \
-+    %{mabi=o64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \
-+    %(fbsd_link_spec)"
-+
-+#undef	LINK_GCC_C_SEQUENCE_SPEC
-+#define LINK_GCC_C_SEQUENCE_SPEC \
-+  "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
-+
-+/* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h
-+   but trashed by config/mips/elf.h.  */
-+#undef  STARTFILE_SPEC
-+#define STARTFILE_SPEC	FBSD_STARTFILE_SPEC
-+
-+/* Provide an ENDFILE_SPEC appropriate for FreeBSD/mips.  */
-+#undef  ENDFILE_SPEC
-+#define ENDFILE_SPEC	FBSD_ENDFILE_SPEC
-+
-+/* Reset our LIB_SPEC which was properly set in config/freebsd.h
-+   but trashed by config/mips/elf.h.  */
-+#undef  LIB_SPEC
-+#define LIB_SPEC	FBSD_LIB_SPEC
-+
-+/* config/mips/mips.h defines CPP_SPEC, and it expects SUBTARGET_CPP_SPEC.  */
-+#undef  SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC FBSD_CPP_SPEC
-+
-+
-+/************************[  Target stuff  ]***********************************/
-+
-+/* Define the actual types of some ANSI-mandated types.
-+   Needs to agree with <machine/ansi.h>.  GCC defaults come from c-decl.c,
-+   c-common.c, and config/<arch>/<arch>.h.  */
-+
-+#undef TARGET_DEFAULT
-+#define TARGET_DEFAULT (MASK_ABICALLS | MASK_SOFT_FLOAT_ABI)
-+
-+/* The generic MIPS TARGET_CPU_CPP_BUILTINS are incorrect for FreeBSD.
-+   Specifically, they define too many namespace-invasive macros.  Override
-+   them here.  Note this is structured for easy comparison to the version
-+   in mips.h.  */
-+
-+#undef  TARGET_CPU_CPP_BUILTINS
-+#define TARGET_CPU_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      builtin_assert ("machine=mips");				\
-+      builtin_assert ("cpu=mips");				\
-+      builtin_define ("__mips__");				\
-+								\
-+      if (TARGET_64BIT)						\
-+	builtin_define ("__mips64");				\
-+								\
-+      if (TARGET_FLOAT64)					\
-+	builtin_define ("__mips_fpr=64");			\
-+      else							\
-+	builtin_define ("__mips_fpr=32");			\
-+								\
-+      if (TARGET_MIPS16)					\
-+	builtin_define ("__mips16");				\
-+								\
-+      if (mips_abi == ABI_N32)                                  \
-+        {                                                       \
-+          builtin_define ("__mips_n32");                        \
-+          builtin_define ("_ABIN32=2");                         \
-+          builtin_define ("_MIPS_SIM=_ABIN32");                 \
-+          builtin_define ("_MIPS_SZLONG=32");                   \
-+          builtin_define ("_MIPS_SZPTR=32");                    \
-+        }                                                       \
-+      else if (mips_abi == ABI_64)                              \
-+        {                                                       \
-+          builtin_define ("__mips_n64");                        \
-+          builtin_define ("_ABI64=3");                          \
-+          builtin_define ("_MIPS_SIM=_ABI64");                  \
-+          builtin_define ("_MIPS_SZLONG=64");                   \
-+          builtin_define ("_MIPS_SZPTR=64");                    \
-+        }                                                       \
-+      else if (mips_abi == ABI_O64)                             \
-+        {                                                       \
-+          builtin_define ("__mips_o64");                        \
-+          builtin_define ("_ABIO64=4");                         \
-+          builtin_define ("_MIPS_SIM=_ABIO64");                 \
-+          builtin_define ("_MIPS_SZLONG=64");                   \
-+          builtin_define ("_MIPS_SZPTR=64");                    \
-+        }                                                       \
-+      else if (mips_abi == ABI_EABI)                            \
-+        {                                                       \
-+          builtin_define ("__mips_eabi");                       \
-+          builtin_define ("_ABIEMB=5");                         \
-+          builtin_define ("_MIPS_SIM=_ABIEMB");                 \
-+          if (TARGET_LONG64)                                    \
-+            builtin_define ("_MIPS_SZLONG=64");                 \
-+          else                                                  \
-+            builtin_define ("_MIPS_SZLONG=32");                 \
-+          if (TARGET_64BIT)                                     \
-+            builtin_define ("_MIPS_SZPTR=64");                  \
-+          else                                                  \
-+            builtin_define ("_MIPS_SZPTR=32");                  \
-+        }                                                       \
-+      else                                                      \
-+        {                                                       \
-+          builtin_define ("__mips_o32");                        \
-+          builtin_define ("_ABIO32=1");                         \
-+          builtin_define ("_MIPS_SIM=_ABIO32");                 \
-+          builtin_define ("_MIPS_SZLONG=32");                   \
-+          builtin_define ("_MIPS_SZPTR=32");                    \
-+        }                                                       \
-+      if (TARGET_FLOAT64)                                       \
-+        builtin_define ("_MIPS_FPSET=32");                      \
-+      else                                                      \
-+        builtin_define ("_MIPS_FPSET=16");                      \
-+                                                                \
-+      builtin_define ("_MIPS_SZINT=32");                        \
-+								\
-+      MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info);	\
-+      MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info);	\
-+								\
-+      if (ISA_MIPS1)                                            \
-+        {                                                       \
-+          builtin_define ("__mips=1");                          \
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS1");         \
-+	}							\
-+      else if (ISA_MIPS2)                                       \
-+        {                                                       \
-+          builtin_define ("__mips=2");                          \
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS2");         \
-+	}							\
-+      else if (ISA_MIPS3)					\
-+        {                                                       \
-+          builtin_define ("__mips=3");                          \
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS3");         \
-+	}							\
-+      else if (ISA_MIPS4)					\
-+        {                                                       \
-+          builtin_define ("__mips=4");                          \
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS4");         \
-+	}							\
-+      else if (ISA_MIPS32)					\
-+	{							\
-+	  builtin_define ("__mips=32");				\
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS32");        \
-+	  builtin_define ("__mips_isa_rev=1");			\
-+	}							\
-+      else if (ISA_MIPS32R2)					\
-+	{							\
-+	  builtin_define ("__mips=32");				\
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS32");        \
-+	  builtin_define ("__mips_isa_rev=2");			\
-+	}							\
-+      else if (ISA_MIPS64)					\
-+	{							\
-+	  builtin_define ("__mips=64");				\
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS64");        \
-+	  builtin_define ("__mips_isa_rev=1");			\
-+	}							\
-+      else if (ISA_MIPS64R2)					\
-+	{							\
-+	  builtin_define ("__mips=64");				\
-+          builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS64");        \
-+	  builtin_define ("__mips_isa_rev=2");			\
-+	}							\
-+	    							\
-+      if (TARGET_HARD_FLOAT)					\
-+	builtin_define ("__mips_hard_float");			\
-+      else if (TARGET_SOFT_FLOAT)				\
-+	builtin_define ("__mips_soft_float");			\
-+								\
-+      if (TARGET_SINGLE_FLOAT)					\
-+	builtin_define ("__mips_single_float");			\
-+								\
-+      if (TARGET_BIG_ENDIAN)					\
-+	builtin_define ("__MIPSEB__");				\
-+      else							\
-+	builtin_define ("__MIPSEL__");				\
-+								\
-+      /* No language dialect defines.  */			\
-+      if (TARGET_ABICALLS)					\
-+	builtin_define ("__ABICALLS__");			\
-+    }								\
-+  while (0)
-+
-+/* Always pass ISA to drivers */
-+#undef DRIVER_SELF_SPECS
-+#define DRIVER_SELF_SPECS						\
-+  MIPS_DEFAULT_ISA_LEVEL_SPEC,						\
-+  MIPS_ISA_LEVEL_SPEC,							\
-+									\
-+  /* Make sure that an endian option is always present.  This makes	\
-+     things like LINK_SPEC easier to write.  */				\
-+  "%{!EB:%{!EL:%(endian_spec)}}",					\
-+									\
-+  BASE_DRIVER_SELF_SPECS
-+
-+#if 0
-+/* Don't default to pcc-struct-return, we want to retain compatibility with
-+   older gcc versions AND pcc-struct-return is nonreentrant.
-+   (even though the SVR4 ABI for the i386 says that records and unions are
-+   returned in memory).  */
-+
-+#undef  DEFAULT_PCC_STRUCT_RETURN
-+#define DEFAULT_PCC_STRUCT_RETURN 0
-+#endif
-+
-+
-+/************************[  Assembler stuff  ]********************************/
-+
-+#undef  SUBTARGET_ASM_SPEC
-+#define SUBTARGET_ASM_SPEC \
-+  "%{!mno-abicalls: %{!fno-PIC:%{!fno-pic:-KPIC}}}"
-+
-+/* -G is incompatible with -KPIC which is the default, so only allow objects
-+   in the small data section if the user explicitly asks for it.  */
-+
-+#undef  MIPS_DEFAULT_GVALUE
-+#define MIPS_DEFAULT_GVALUE 0
-+
-+/* If defined, a C expression whose value is a string containing the
-+   assembler operation to identify the following data as
-+   uninitialized global data.  If not defined, and neither
-+   `ASM_OUTPUT_BSS' nor `ASM_OUTPUT_ALIGNED_BSS' are defined,
-+   uninitialized global data will be output in the data section if
-+   `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be
-+   used.  */
-+#undef  BSS_SECTION_ASM_OP
-+#define BSS_SECTION_ASM_OP "\t.section\t.bss"
-+
-+/* Like `ASM_OUTPUT_BSS' except takes the required alignment as a
-+   separate, explicit argument.  If you define this macro, it is used
-+   in place of `ASM_OUTPUT_BSS', and gives you more flexibility in
-+   handling the required alignment of the variable.  The alignment is
-+   specified as the number of bits.
-+
-+   Try to use function `asm_output_aligned_bss' defined in file
-+   `varasm.c' when defining this macro.  */
-+#undef  ASM_OUTPUT_ALIGNED_BSS
-+#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
-+  asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
-+
-+/* Standard AT&T UNIX 'as' local label spelling.  */
-+#undef  LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX "."
-+
-+/* Currently we don't support 128bit long doubles, so for now we force
-+   n32 to be 64bit.  */
-+#undef	LONG_DOUBLE_TYPE_SIZE
-+#define	LONG_DOUBLE_TYPE_SIZE 64
-+ 
-+#ifdef IN_LIBGCC2
-+#undef	LIBGCC2_LONG_DOUBLE_TYPE_SIZE
-+#define	LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64
-+#endif
-+
-+/************************[  Debugger stuff  ]*********************************/
-+#undef DBX_DEBUGGING_INFO
-+
-+#if MIPS_ABI_DEFAULT == ABI_64
-+#undef STANDARD_STARTFILE_PREFIX_1
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#undef STANDARD_STARTFILE_PREFIX_2
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
-+#endif
-diff --git a/libgcc/config.host b/libgcc/config.host
-index f4a7428..5e5c33e 100644
---- libgcc/config.host
-+++ libgcc/config.host
-@@ -783,6 +783,8 @@ microblaze*-*-rtems*)
- 	tmake_file="${tmake_file} microblaze/t-microblaze t-fdpbit"
- 	extra_parts="$extra_parts crtbeginS.o crtendS.o crtbeginT.o crti.o crtn.o"
- 	;;
-+mips*-*-freebsd*)			# FreeBSD/mips, either endian.
-+	;;
- mips*-*-netbsd*)			# NetBSD/mips, either endian.
- 	;;
- mips*-*-linux*)				# Linux MIPS, either endian.
diff --git a/devel/freebsd-gcc6/files/patch-libcpp_lex.c b/devel/freebsd-gcc6/files/patch-libcpp_lex.c
deleted file mode 100644
index 05ad28872d11..000000000000
--- a/devel/freebsd-gcc6/files/patch-libcpp_lex.c
+++ /dev/null
@@ -1,25 +0,0 @@
-This is
-
-  commit cd547f0ddcd3a54e5b73bcda5ac0f0c46808db8b
-  Author: Jakub Jelinek <jakub@redhat.com>
-  Date:   Sat Sep 26 10:07:41 2020 +0200
-
-which is on the GCC 10 release branch and thus part of lang/gcc10-devel;
-we should automatically get it with GCC 10.3.
-
---- libcpp/lex.c.orig	2020-11-02 10:24:50 UTC
-+++ libcpp/lex.c
-@@ -531,11 +531,11 @@ init_vectorized_lexer (void)
-   search_line_fast = impl;
- }
- 
--#elif defined(_ARCH_PWR8) && defined(__ALTIVEC__)
-+#elif (GCC_VERSION >= 4005) && defined(_ARCH_PWR8) && defined(__ALTIVEC__)
- 
- /* A vection of the fast scanner using AltiVec vectorized byte compares
-    and VSX unaligned loads (when VSX is available).  This is otherwise
--   the same as the pre-GCC 5 version.  */
-+   the same as the AltiVec version.  */
- 
- ATTRIBUTE_NO_SANITIZE_UNDEFINED
- static const uchar *
diff --git a/devel/freebsd-gcc6/files/xtoolchain.mk.in b/devel/freebsd-gcc6/files/xtoolchain.mk.in
deleted file mode 100644
index 36ab19570df6..000000000000
--- a/devel/freebsd-gcc6/files/xtoolchain.mk.in
+++ /dev/null
@@ -1,5 +0,0 @@
-XCC=%%LOCALBASE%%/bin/%%GCC_TARGET%%-gcc6
-XCXX=%%LOCALBASE%%/bin/%%GCC_TARGET%%-g++6
-XCPP=%%LOCALBASE%%/bin/%%GCC_TARGET%%-cpp6
-CROSS_BINUTILS_PREFIX=%%LOCALBASE%%/%%GCC_TARGET%%/bin/
-X_COMPILER_TYPE=gcc
diff --git a/devel/freebsd-gcc6/pkg-descr b/devel/freebsd-gcc6/pkg-descr
deleted file mode 100644
index aa16abf61500..000000000000
--- a/devel/freebsd-gcc6/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-GCC, the GNU Compiler Collection, supporting C and C++ for building the
-FreeBSD base system.
diff --git a/devel/freebsd-gcc6/pkg-plist b/devel/freebsd-gcc6/pkg-plist
deleted file mode 100644
index 59e1c52e968d..000000000000
--- a/devel/freebsd-gcc6/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/%%GCC_TARGET%%-c++%%SUFFIX%%
-bin/%%GCC_TARGET%%-cpp%%SUFFIX%%
-bin/%%GCC_TARGET%%-g++%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcc%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcc-%%GCC_VERSION%%
-bin/%%GCC_TARGET%%-gcc-ar%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcc-nm%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcc-ranlib%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcov%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcov-dump%%SUFFIX%%
-bin/%%GCC_TARGET%%-gcov-tool%%SUFFIX%%
-man/man1/%%GCC_TARGET%%-cpp%%SUFFIX%%.1.gz
-man/man1/%%GCC_TARGET%%-g++%%SUFFIX%%.1.gz
-man/man1/%%GCC_TARGET%%-gcc%%SUFFIX%%.1.gz
-man/man1/%%GCC_TARGET%%-gcov%%SUFFIX%%.1.gz
-man/man1/%%GCC_TARGET%%-gcov-dump%%SUFFIX%%.1.gz
-man/man1/%%GCC_TARGET%%-gcov-tool%%SUFFIX%%.1.gz
-share/toolchains/%%TARGETARCH%%-gcc%%SUFFIX%%.mk
diff --git a/devel/freebsd-gcc6/pkg-plist.aarch64 b/devel/freebsd-gcc6/pkg-plist.aarch64
deleted file mode 100644
index 1fe2955d287c..000000000000
--- a/devel/freebsd-gcc6/pkg-plist.aarch64
+++ /dev/null
@@ -1,10 +0,0 @@
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-arches.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-cores.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-elf.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-%%OPSYS%%.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-fusion-pairs.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-opts.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-protos.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-tuning-flags.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/biarchlp64.h
diff --git a/devel/freebsd-gcc6/pkg-plist.amd64 b/devel/freebsd-gcc6/pkg-plist.amd64
deleted file mode 100644
index 421caaf7d406..000000000000
--- a/devel/freebsd-gcc6/pkg-plist.amd64
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
diff --git a/devel/freebsd-gcc6/pkg-plist.arm b/devel/freebsd-gcc6/pkg-plist.arm
deleted file mode 100644
index 685b38a60ece..000000000000
--- a/devel/freebsd-gcc6/pkg-plist.arm
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_neon.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/aarch-common-protos.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
diff --git a/devel/freebsd-gcc6/pkg-plist.common b/devel/freebsd-gcc6/pkg-plist.common
deleted file mode 100644
index 8944e03fef41..000000000000
--- a/devel/freebsd-gcc6/pkg-plist.common
+++ /dev/null
@@ -1,397 +0,0 @@
-%%FLOAT_H%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.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
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdbool.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stddef.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdfix.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdint-gcc.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdint.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdnoreturn.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tgmath.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/varargs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixinc_list
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/gsyslimits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/README
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/limits.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/macro_list
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders.conf
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gtype.state
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ada/gcc-interface/ada-tree.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/addresses.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/alias.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/all-tree.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/alloc-pool.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/ansidecl.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/asan.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/attribs.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/auto-host.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/auto-profile.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/b-header-vars
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/backend.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/basic-block.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bb-reorder.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/bitmap.h
*** 489 LINES SKIPPED ***