diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	gcc-arm-embedded
-PORTVERSION=	10.3.20210921
+PORTVERSION=	13.3.20240704
 PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/${FULL_VERSION}/
-DISTNAME=	${ORIGINAL_PACKAGE_NAME}-src
+MASTER_SITES=	https://developer.arm.com/-/media/Files/downloads/gnu/${FULL_VERSION}/srcrel/
+DISTNAME=	${ORIGINAL_PACKAGE_NAME}
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Complete gcc-based toolcahin for embedded ARM development
-WWW=		https://launchpad.net/gcc-arm-embedded
+WWW=		https://developer.arm.com
 
 LICENSE=	GPLv2 LGPL20 LGPL21 GPLv3 LGPL3
 LICENSE_COMB=	multi
@@ -16,9 +16,10 @@
 			mips mips64 mips64el mipsel mipsn32
 NOT_FOR_ARCHS_REASON=	Very slow to build on emulator
 
-BUILD_DEPENDS=		objdump:devel/binutils
+BUILD_DEPENDS=		objdump:devel/binutils \
+			docbook2man:textproc/docbook2X
 
-OPTIONS_DEFINE=	APROFILE PURE PYGDB EXAMPLES HTML PDF DOCS SYMLINK
+OPTIONS_DEFINE=	APROFILE PURE PYGDB HTML PDF DOCS SYMLINK
 OPTIONS_DEFAULT=PURE PYGDB SYMLINK
 APROFILE_DESC=	Add support for Cortex-A profiles
 PURE_DESC=	Use all libraries from bundle, do not depend on anything
@@ -37,21 +38,22 @@
 PDF_USE=		TEX=base:build,tex:build,dvipsk:build
 PDF_BUILD_DEPENDS=	texi2dvi:print/texinfo
 PYGDB_USES=		python
+DOCS_USES=		python
 
 OPTIONS_SUB=		yes
 
 USES=			bison compiler:c++11-lang cpe gmake gettext-runtime \
-			makeinfo tar:bzip2 iconv
+			makeinfo tar:xz iconv
 
 GNU_CONFIGURE=	yes
 
-PATCH_WRKSRC=	${WRKDIR}/${ORIGINAL_PACKAGE_NAME}
+PATCH_WRKSRC=	${WRKDIR}
 BUILD_WRKSRC=	${WRKDIR}
 
-GCC_VERSION=		10.3.1
-FULL_VERSION=		10.3-2021.10
+GCC_VERSION=		13.3.1
+FULL_VERSION=		13.3.rel1
 TARGET=			arm-none-eabi
-ORIGINAL_PACKAGE_NAME=	gcc-${TARGET}-${FULL_VERSION}
+ORIGINAL_PACKAGE_NAME=	arm-gnu-toolchain-src-snapshot-${FULL_VERSION}
 
 CPE_PRODUCT=	gcc
 CPE_VENDOR=	gnu
@@ -63,35 +65,25 @@
 
 MANDIRS=	${PREFIX}/${PORTNAME}-${FULL_VERSION}/${DOCS_SUFFIX}/man
 DOCSDIR=	${PREFIX}/${PORTNAME}-${FULL_VERSION}/${DOCS_SUFFIX}
-EXAMPLESDIR=	${PREFIX}/${PORTNAME}-${FULL_VERSION}/share/gcc-${TARGET}/samples
 
 PLIST_SUB+=	TARGET=${TARGET} FULL_VERSION=${FULL_VERSION} \
 		GCC_VERSION=${GCC_VERSION}
 
+DOCBOOK_TO_MAN=	docbook2man
 DOCS_SUFFIX=	share/doc/gcc-${TARGET}
-SRC_DIR=	${WRKDIR}/${ORIGINAL_PACKAGE_NAME}/src
+SRC_DIR=	${WRKDIR}
 BUILD_DIR=	${WRKDIR}/build
 INTERIM_WORLD=	${WRKDIR}/install
 INTERIM_PREFIX=	${INTERIM_WORLD}/${PORTNAME}-${FULL_VERSION}
 
-BUNDLED_LIBS=			EXPAT:bz2 ZLIB:gz LIBELF:gz \
-				GMP:bz2 MPFR:bz2 MPC:gz ISL:xz
-BUNDLED_VERSION_EXPAT=		2.1.1
-BUNDLED_VERSION_ZLIB=		1.2.8
-BUNDLED_VERSION_LIBELF=		0.8.13
-BUNDLED_VERSION_GMP=		6.1.0
-BUNDLED_VERSION_MPFR=		3.1.4
-BUNDLED_VERSION_MPC=		1.0.3
-BUNDLED_VERSION_ISL=		0.18
-
 VAR_TO_SUBMAKE=	BUILD_DIR CC CFLAGS CHOSEN_COMPILER_TYPE CONFIG_SITE \
 		CONFIGURE_MAX_CMD_LEN CONFIGURE_SHELL CP CPP CPPFLAGS CXX \
-		CXXFLAGS DOCS_SUFFIX ECHO_MSG EXAMPLESDIR FILE FIND GMAKE \
+		CXXFLAGS DOCS_SUFFIX ECHO_MSG FILE FIND GMAKE \
 		GCC_VERSION GREP MAKE_CMD MAKE_SHELL PATCH \
 		INSTALL_MACROS INTERIM_PREFIX INTERIM_WORLD LD LDFLAGS LIBDIR \
-		LN LOCALBASE MAKE_JOBS_NUMBER MKDIR ORIGINAL_PACKAGE_NAME \
+		LN LOCALBASE MAKE_JOBS_NUMBER MKDIR MV ORIGINAL_PACKAGE_NAME \
 		PORT_OPTIONS PREFIX PYTHON_CMD RM SED SH SRC_DIR STRIP_CMD TAR \
-		TARGET WRKDIR CONFIGURE_TARGET
+		TARGET WRKDIR CONFIGURE_TARGET DOCBOOK_TO_MAN
 
 VAR_TO_SUBMAKE_NOEXPAND=	CONFIGURE_ENV MAKE_ENV
 
@@ -105,22 +97,6 @@
 USE_GCC=	yes
 .endif
 
-post-extract:
-.if ${PORT_OPTIONS:MPURE}
-.for L in ${BUNDLED_LIBS}
-	@${ECHO_MSG} "====>  Extracting bundled ${L:C/[:].+//:tl}"
-	@${TAR} -xf ${SRC_DIR}/${L:C/[:].+//:tl}-${BUNDLED_VERSION_${L:C/[:].+//}}.tar.${L:C/.+[:]//} -C ${SRC_DIR}
-.endfor
-.endif
-	@${ECHO_MSG} "====>  Extracting bundled binutils"
-	@${TAR} -xf ${SRC_DIR}/binutils.tar.bz2 -C ${SRC_DIR}
-	@${ECHO_MSG} "====>  Extracting bundled gcc"
-	@${TAR} -xf ${SRC_DIR}/gcc.tar.bz2 -C ${SRC_DIR}
-	@${ECHO_MSG} "====>  Extracting bundled gdb"
-	@${TAR} -xf ${SRC_DIR}/gdb.tar.bz2 -C ${SRC_DIR}
-	@${ECHO_MSG} "====>  Extracting bundled newlib"
-	@${TAR} -xf ${SRC_DIR}/newlib.tar.bz2 -C ${SRC_DIR}
-
 do-configure:
 	@${RM} -r ${BUILD_DIR}
 	@${MKDIR} ${BUILD_DIR}
@@ -131,10 +107,6 @@
 .for VAR in ${VAR_TO_SUBMAKE}
 	@${ECHO} '${VAR}=${${VAR}}' >> ${WRKDIR}/Makefile.inc
 .endfor
-.for L in ${BUNDLED_LIBS}
-	@${ECHO} -n 'BUNDLED_VERSION_${L:C/[:].+//}='   >> ${WRKDIR}/Makefile.inc
-	@${ECHO}    '${BUNDLED_VERSION_${L:C/[:].+//}}' >> ${WRKDIR}/Makefile.inc
-.endfor
 .for VAR in ${VAR_TO_SUBMAKE_NOEXPAND}
 	@${ECHO} -n '${VAR}='                          >> ${WRKDIR}/Makefile.inc
 	@${MAKE} .MAKE.EXPAND_VARIABLES=0 -X -V ${VAR} >> ${WRKDIR}/Makefile.inc
diff --git a/devel/gcc-arm-embedded/distinfo b/devel/gcc-arm-embedded/distinfo
--- a/devel/gcc-arm-embedded/distinfo
+++ b/devel/gcc-arm-embedded/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649877811
-SHA256 (gcc-arm-none-eabi-10.3-2021.10-src.tar.bz2) = 94e582e4dd3a6014dea0485be0377c6478bd3c9e1301190f05810aa2ad989cbf
-SIZE (gcc-arm-none-eabi-10.3-2021.10-src.tar.bz2) = 201152632
+TIMESTAMP = 1725593723
+SHA256 (arm-gnu-toolchain-src-snapshot-13.3.rel1.tar.xz) = 8fd5babbe95a02e82aa4cdbbd8a96ad4adac07fb1b03e8cdba86755d36370a90
+SIZE (arm-gnu-toolchain-src-snapshot-13.3.rel1.tar.xz) = 311296788
diff --git a/devel/gcc-arm-embedded/files/Makefile b/devel/gcc-arm-embedded/files/Makefile
--- a/devel/gcc-arm-embedded/files/Makefile
+++ b/devel/gcc-arm-embedded/files/Makefile
@@ -31,8 +31,6 @@
 
 .if ${PORT_OPTIONS:MPURE}
 PREREQUISITES=	expat \
-		zlib \
-		libelf \
 		gmp \
 		mpfr \
 		mpc \
@@ -54,12 +52,12 @@
 	 --mandir=${DOC_PREFIX}/man \
 	 --htmldir=${DOC_PREFIX}/html \
 	 --pdfdir=${DOC_PREFIX}/pdf \
-	 --disable-nls \
 	 --disable-sim \
 	 --disable-gas \
 	 --disable-binutils \
 	 --disable-ld \
 	 --disable-gprof \
+	 --enable-gdb \
 	 --with-libexpat \
 	 --with-libexpat-prefix=${WORLD_LIB} \
 	 --with-lzma=no \
@@ -67,18 +65,17 @@
 	 --with-gdb-datadir='$${prefix}/${TARGET}/share/gdb' \
 	 --with-pkgversion="${PKGVERSION}"
 
-ALL_BUILD=	build-binutils \
-		build-gcc-first \
-		build-newlib \
-		build-newlib-nano \
-		build-gcc-final \
-		build-libstdcxx \
-		build-gdb  \
-		${_pygdb} \
-		install-samples \
-		install-misc \
-		strip-binaries \
-		strip-target-libraries
+ALL_BUILD=	build-binutils
+ALL_BUILD+=	build-gcc-first
+ALL_BUILD+=	build-newlib
+ALL_BUILD+=	build-newlib-nano
+ALL_BUILD+=	build-gcc-final
+ALL_BUILD+=	build-libstdcxx
+ALL_BUILD+=	build-gdb
+ALL_BUILD+=	${_pygdb}
+#ALL_BUILD+=	install-misc
+ALL_BUILD+=	strip-binaries
+ALL_BUILD+=	strip-target-libraries
 
 .PHONY: ${PREREQUISITES} ${ALL_BUILD}
 
@@ -90,13 +87,13 @@
 	@${MKDIR} ${BUILD_PREFIX}/expat
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/expat && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/expat-${BUNDLED_VERSION_EXPAT}/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/libexpat/expat/configure \
 	 --build=${CONFIGURE_TARGET} \
 	 --host=${CONFIGURE_TARGET} \
 	 --target=${TARGET} \
 	 --prefix=${INTERIM_WORLD} \
 	 --disable-shared \
-	 --disable-nls
+	 --with-docbook
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/expat all ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -107,7 +104,7 @@
 	@${RM} -rf ${BUILD_PREFIX}/zlib
 	@${MKDIR} ${BUILD_PREFIX}/zlib
 	@${ECHO_MSG} "=====>  Copy to build dir"
-	@${TAR} -cf - -C ${SRC_DIR}/zlib-${BUNDLED_VERSION_ZLIB} . | ${TAR} -xf - -C ${BUILD_PREFIX}/zlib
+	@${TAR} -cf - -C ${SRC_DIR}/zlib . | ${TAR} -xf - -C ${BUILD_PREFIX}/zlib
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/zlib && \
 	 ${MAKE_ENV} ${CONFIGURE_ENV} ./configure \
@@ -124,12 +121,11 @@
 	@${MKDIR} ${BUILD_PREFIX}/libelf
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/libelf && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/libelf-${BUNDLED_VERSION_LIBELF}/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/libelf/configure \
 	 --prefix=${INTERIM_WORLD} \
 	 --build=${CONFIGURE_TARGET} \
 	 --host=${CONFIGURE_TARGET} \
-	 --disable-shared \
-	 --disable-nls
+	 --disable-shared
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/libelf all ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -141,13 +137,12 @@
 	@${MKDIR} ${BUILD_PREFIX}/gmp
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/gmp && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/gmp-${BUNDLED_VERSION_GMP}/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/gmp/configure \
 	 --build=${CONFIGURE_TARGET} \
 	 --host=${CONFIGURE_TARGET} \
 	 --prefix=${INTERIM_WORLD} \
 	 --enable-cxx \
-	 --disable-shared \
-	 --disable-nls
+	 --disable-shared
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gmp all ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -159,14 +154,13 @@
 	@${MKDIR} ${BUILD_PREFIX}/mpfr
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/mpfr && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpfr-${BUNDLED_VERSION_MPFR}/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpfr/configure \
 	 --build=${CONFIGURE_TARGET} \
 	 --host=${CONFIGURE_TARGET} \
 	 --target=${TARGET} \
 	 --prefix=${INTERIM_WORLD} \
 	 --with-gmp=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
+	 --disable-shared
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/mpfr all ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -178,15 +172,14 @@
 	@${MKDIR} ${BUILD_PREFIX}/mpc
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/mpc && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpc-${BUNDLED_VERSION_MPC}/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/mpc/configure \
 	 --build=${CONFIGURE_TARGET} \
 	 --host=${CONFIGURE_TARGET} \
 	 --target=${TARGET} \
 	 --prefix=${INTERIM_WORLD} \
 	 --with-gmp=${INTERIM_WORLD} \
 	 --with-mpfr=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
+	 --disable-shared
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/mpc all ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -198,14 +191,13 @@
 	@${MKDIR} ${BUILD_PREFIX}/isl
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/isl && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/isl-${BUNDLED_VERSION_ISL}/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/isl/configure \
 	 --build=${CONFIGURE_TARGET} \
 	 --host=${CONFIGURE_TARGET} \
 	 --target=${TARGET} \
 	 --prefix=${INTERIM_WORLD} \
 	 --with-gmp-prefix=${INTERIM_WORLD} \
-	 --disable-shared \
-	 --disable-nls
+	 --disable-shared
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/isl all ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -217,7 +209,7 @@
 	@${MKDIR} ${BUILD_PREFIX}/binutils
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/binutils && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/binutils/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/binutils-gdb/configure \
 	 --target=${TARGET} \
 	 --prefix=${INTERIM_PREFIX} \
 	 --infodir=${DOC_PREFIX}/info \
@@ -309,7 +301,7 @@
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/newlib && \
 	 ${MAKE_ENV} ${CONFIGURE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" CFLAGS_FOR_TARGET="-g -O2 -ffunction-sections -fdata-sections" \
-	  ${SRC_DIR}/newlib/configure \
+	  ${SRC_DIR}/newlib-cygwin/configure \
 	 --target=${TARGET} \
 	 --prefix=${INTERIM_PREFIX} \
 	 --infodir=${DOC_PREFIX}/info \
@@ -320,12 +312,14 @@
 	 --enable-newlib-io-c99-formats \
 	 --enable-newlib-register-fini \
 	 --enable-newlib-retargetable-locking \
-	 --disable-newlib-supplied-syscalls \
-	 --disable-nls
+	 --disable-newlib-supplied-syscalls
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/newlib all
 	@${ECHO_MSG} "=====>  Install into stage directory"
 	@${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib install
+	@${ECHO_MSG} "=====>  Fixing limits.h / syslimits.h"
+	@${MV} ${INTERIM_PREFIX}/${TARGET}/include/limits.h ${INTERIM_PREFIX}/${TARGET}/include/syslimits.h
+	@${CP} ${INTERIM_PREFIX}/lib/gcc/${TARGET}/${GCC_VERSION}/include/limits.h ${INTERIM_PREFIX}/${TARGET}/include/limits.h
 .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "=====>  Build HTML documentation"
 	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/newlib html ${MAKE_ARGS}
@@ -351,7 +345,7 @@
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/newlib-nano && \
 	 ${MAKE_ENV} ${CONFIGURE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" CFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections" \
-	  ${SRC_DIR}/newlib/configure \
+	  ${SRC_DIR}/newlib-cygwin/configure \
 	 --target=${TARGET} \
 	 --prefix=${BUILD_PREFIX}/target-libs \
 	 --infodir=${DOC_PREFIX}/info \
@@ -369,8 +363,7 @@
 	 --disable-newlib-unbuf-stream-opt     \
 	 --enable-lite-exit                    \
 	 --enable-newlib-global-atexit         \
-	 --enable-newlib-nano-formatted-io     \
-	 --disable-nls
+	 --enable-newlib-nano-formatted-io
 	@${ECHO_MSG} "=====>  Build"
 	@${MAKE_ENV} PATH="${INTERIM_PREFIX}/bin:${PATH}" ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/newlib-nano all
 	@${ECHO_MSG} "=====>  Install into intermediate directory"
@@ -410,10 +403,11 @@
 	 --disable-shared \
 	 --disable-threads \
 	 --disable-tls \
+	 --disable-sjlj-exceptions \
 	 --with-gnu-as \
 	 --with-gnu-ld \
 	 --with-newlib \
-	 --with-headers=yes \
+	 --with-headers=/usr/include \
 	 --with-python-dir=share/gcc-${TARGET} \
 	 --with-sysroot=${INTERIM_PREFIX}/${TARGET} \
 	 --with-multilib-list=${MULTILIB_LIST} \
@@ -475,10 +469,11 @@
 	 --disable-shared \
 	 --disable-threads \
 	 --disable-tls \
+	 --disable-gprof \
 	 --with-gnu-as \
 	 --with-gnu-ld \
 	 --with-newlib \
-	 --with-headers=yes \
+	 --with-headers=${INTERIM_PREFIX}/${TARGET}/sys-include \
 	 --with-python-dir=share/gcc-${TARGET} \
 	 --with-sysroot=${BUILD_PREFIX}/target-libs/${TARGET} \
 	 --with-multilib-list=${MULTILIB_LIST} \
@@ -507,13 +502,13 @@
 	@${MKDIR} ${BUILD_PREFIX}/gdb
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/gdb && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/gdb/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/binutils-gdb/configure \
 	 ${COMMON_GDB_CONFIGURE_ARGS} \
 	 --with-python=no
 	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gdb all ${MAKE_ARGS}
+	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/gdb all-gdb ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into stage directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb install ${MAKE_ARGS}
+	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb install-gdb ${MAKE_ARGS}
 	@${RM} -rf ${INTERIM_PREFIX}/include
 .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "=====>  Build HTML documentation"
@@ -534,14 +529,14 @@
 	@${MKDIR} ${BUILD_PREFIX}/py-gdb
 	@${ECHO_MSG} "=====>  Configure"
 	@cd ${BUILD_PREFIX}/py-gdb && \
-	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/gdb/configure \
+	 ${MAKE_ENV} ${CONFIGURE_ENV} ${SRC_DIR}/binutils-gdb/configure \
 	 ${COMMON_GDB_CONFIGURE_ARGS} \
 	 --with-python=${PYTHON_CMD} \
 	 --program-prefix=${TARGET}- --program-suffix=-py
 	@${ECHO_MSG} "=====>  Build"
-	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/py-gdb all ${MAKE_ARGS}
+	@${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${BUILD_PREFIX}/py-gdb all-gdb ${MAKE_ARGS}
 	@${ECHO_MSG} "=====>  Install into stage directory"
-	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/py-gdb install ${MAKE_ARGS}
+	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/py-gdb install-gdb ${MAKE_ARGS}
 	@${RM} -rf ${INTERIM_PREFIX}/include
 .if ${PORT_OPTIONS:MHTML} && ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "=====>  Build HTML documentation"
@@ -556,14 +551,6 @@
 	@${MAKE_ENV} ${MAKE_CMD} -C ${BUILD_PREFIX}/gdb install-pdf ${MAKE_ARGS}
 .endif
 
-install-samples:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${ECHO_MSG} "====>  Install samples into stage directory"
-	@${TAR} -xf ${SRC_DIR}/samples.tar.bz2 -C ${INTERIM_PREFIX}/share/gcc-${TARGET}
-.else
-	@${DO_NADA}
-.endif
-
 install-misc:
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "====>  Install misc. files into stage directory"
@@ -593,7 +580,7 @@
 strip-target-libraries:
 	@${ECHO_MSG} "====>  Strip target libraries"
 	@for target in $$(${FIND} ${INTERIM_PREFIX}/${TARGET}/lib ${INTERIM_PREFIX}/lib/gcc/${TARGET}/${GCC_VERSION} -type f -name \*.a -o -name \*.o) ; do \
-	   ${INTERIM_PREFIX}/bin/${TARGET}-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc $${target} ; \
+	   ${INTERIM_PREFIX}/bin/${TARGET}-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc $${target} || true ; \
 	done
 	@${ECHO_MSG} "====>  Remove *.la files and other leftovers"
 	@${FIND} ${INTERIM_PREFIX} -name \*.la -delete
diff --git a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_config_arm_arm.h b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_config_arm_arm.h
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_config_arm_arm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gcc/gcc/config/arm/arm.h.orig	2019-10-11 00:03:43 UTC
-+++ src/gcc/gcc/config/arm/arm.h
-@@ -2211,7 +2211,7 @@ extern const char *arm_target_thumb_only (int argc, co
- 
- /* -mcpu=native handling only makes sense with compiler running on
-    an ARM chip.  */
--#if defined(__arm__)
-+#if defined(__arm__) && !defined(CROSS_DIRECTORY_STRUCTURE)
- extern const char *host_detect_local_cpu (int argc, const char **argv);
- #define HAVE_LOCAL_CPU_DETECT
- # define MCPU_MTUNE_NATIVE_FUNCTIONS			\
diff --git a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_system.h b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_system.h
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_system.h
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/gcc/gcc/system.h.orig	2021-06-01 00:15:23 UTC
-+++ src/gcc/gcc/system.h
-@@ -203,19 +203,6 @@ extern int fprintf_unlocked (FILE *, const char *, ...
- #endif
- #endif
- 
--/* There are an extraordinary number of issues with <ctype.h>.
--   The last straw is that it varies with the locale.  Use libiberty's
--   replacement instead.  */
--#include "safe-ctype.h"
--
--#include <sys/types.h>
--
--#include <errno.h>
--
--#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
--extern int errno;
--#endif
--
- #ifdef __cplusplus
- #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY)
- # include <algorithm>
-@@ -235,6 +222,19 @@ extern int errno;
- # include <cstring>
- # include <new>
- # include <utility>
-+#endif
-+
-+/* There are an extraordinary number of issues with <ctype.h>.
-+   The last straw is that it varies with the locale.  Use libiberty's
-+   replacement instead.  */
-+#include "safe-ctype.h"
-+
-+#include <sys/types.h>
-+
-+#include <errno.h>
-+
-+#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
-+extern int errno;
- #endif
- 
- /* Some of glibc's string inlines cause warnings.  Plus we'd rather
diff --git a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_tree-vect-loop.c b/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_tree-vect-loop.c
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gcc_gcc_tree-vect-loop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gcc/gcc/tree-vect-loop.c.orig	2019-12-02 09:49:15 UTC
-+++ src/gcc/gcc/tree-vect-loop.c
-@@ -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/gcc-arm-embedded/files/patch-src_gdb_gdb_dtrace-probe.c b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_dtrace-probe.c
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_dtrace-probe.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdb/gdb/dtrace-probe.c.orig	2019-10-26 00:03:38 UTC
-+++ src/gdb/gdb/dtrace-probe.c
-@@ -77,6 +77,8 @@ struct dtrace_probe_enabler
- class dtrace_static_probe_ops : public static_probe_ops
- {
- public:
-+  dtrace_static_probe_ops() {}
-+
-   /* See probe.h.  */
-   bool is_linespec (const char **linespecp) const override;
- 
diff --git a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_dwarf2_macro.c b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_dwarf2_macro.c
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_dwarf2_macro.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gdb/gdb/dwarf2/macro.c.orig	2021-01-11 21:34:03.097341000 +0300
-+++ src/gdb/gdb/dwarf2/macro.c	2021-01-11 21:37:13.156194000 +0300
-@@ -678,7 +678,7 @@
- 	  }
- 	  break;
- 
--        case DW_MACINFO_vendor_ext:
-+        case DW_MACRO_hi_user:
- 	  if (!section_is_gnu)
- 	    {
- 	      unsigned int bytes_read;
-@@ -823,7 +823,7 @@
- 	  mac_ptr += offset_size;
- 	  break;
- 
--	case DW_MACINFO_vendor_ext:
-+	case DW_MACRO_hi_user:
- 	  /* Only skip the data by MAC_PTR.  */
- 	  if (!section_is_gnu)
- 	    {
diff --git a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_probe.c b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_probe.c
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_probe.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdb/gdb/probe.c.orig	2019-10-26 00:03:38 UTC
-+++ src/gdb/gdb/probe.c
-@@ -43,6 +43,8 @@
- class any_static_probe_ops : public static_probe_ops
- {
- public:
-+  any_static_probe_ops() {}
-+
-   /* See probe.h.  */
-   bool is_linespec (const char **linespecp) const override;
- 
diff --git a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_python_python-config.py b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_python_python-config.py
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_python_python-config.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdb/gdb/python/python-config.py.orig	2018-05-04 21:32:36 UTC
-+++ src/gdb/gdb/python/python-config.py
-@@ -58,7 +58,7 @@ for opt in opt_flags:
-         print (to_unix_path(' '.join(flags)))
- 
-     elif opt in ('--libs', '--ldflags'):
--        libs = ['-lpython' + pyver + abiflags]
-+        libs = ['-L' + sysconfig.PREFIX + "/lib", '-lpython' + pyver + abiflags]
-         if getvar('LIBS') is not None:
-             libs.extend(getvar('LIBS').split())
-         if getvar('SYSLIBS') is not None:
diff --git a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_target-float.c b/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_target-float.c
deleted file mode 100644
--- a/devel/gcc-arm-embedded/files/patch-src_gdb_gdb_target-float.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gdb/gdb/target-float.c.orig	2019-10-26 00:03:38 UTC
-+++ src/gdb/gdb/target-float.c
-@@ -1153,7 +1153,9 @@ host_float_ops<T>::compare (const gdb_byte *x, const s
- 
- #ifdef HAVE_LIBMPFR
- 
-+#ifndef MPFR_USE_INTMAX_T
- #define MPFR_USE_INTMAX_T
-+#endif
- 
- #include <mpfr.h>
- 
diff --git a/devel/gcc-arm-embedded/pkg-plist b/devel/gcc-arm-embedded/pkg-plist
--- a/devel/gcc-arm-embedded/pkg-plist
+++ b/devel/gcc-arm-embedded/pkg-plist
@@ -813,7 +813,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/random.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/random.tcc
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/range_access.h
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/range_cmp.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/ranges_algo.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/ranges_algobase.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/bits/ranges_uninitialized.h
@@ -917,7 +916,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/cwchar
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/cwctype
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/cxxabi.h
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/debug/array
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/debug/assertions.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/debug/bitset
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/c++/%%GCC_VERSION%%/debug/debug.h
@@ -1501,7 +1499,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/_endian.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/_time.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/_types.h
-gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/acle-compat.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/ansi.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/endian.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/machine/fastmath.h
@@ -1587,6 +1584,7 @@
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/unistd.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/utime.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/sys/wait.h
+gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/syslimits.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/tar.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/termios.h
 gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/tgmath.h
@@ -2869,9 +2867,7 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/crtfastmath.o
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/crti.o
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/crtn.o
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/include-fixed/limits.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/include-fixed/README
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/include-fixed/syslimits.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/include/arm_bf16.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/include/arm_cde.h
@@ -2910,7 +2906,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/libgcc.a
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/libgcov.a
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/lto-wrapper
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/lto1
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/gengtype
@@ -2934,7 +2929,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/basic-block.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/bb-reorder.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/bitmap.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/brig-builtins.def
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/builtin-attrs.def
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/builtin-types.def
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/builtins.def
@@ -2975,7 +2969,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/bpabi.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/elf.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/unknown-elf.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/elfos.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/config/newlib-stdint.h
@@ -3000,7 +2993,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/data-streamer.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/dbgcnt.def
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/dbgcnt.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/dbxout.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/dce.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/ddg.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/debug.h
@@ -3066,7 +3058,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-match.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-predict.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-pretty-print.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-ssa-evrp-analyze.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-ssa-warn-restrict.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-ssa.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gimple-streamer.h
@@ -3082,7 +3073,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/graphite.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/graphviz.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gsstruct.def
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gstab.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gsyms.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gsyslimits.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/gtm-builtins.def
@@ -3098,9 +3088,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hooks.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hosthooks-def.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hosthooks.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-brig-format.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-builtins.def
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hsa-common.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hw-doloop.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/hwint.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/ifcvt.h
@@ -3163,7 +3150,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-builtins.def
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-expand.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-general.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-grid.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-low.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-offload.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/omp-simd-clone.h
@@ -3241,7 +3227,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/sreal.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/ssa-iterators.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/ssa.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/stab.def
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/statistics.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/stmt.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/stor-layout.h
@@ -3345,7 +3330,6 @@
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/wide-int-print.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/wide-int.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/xcoff.h
-gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/include/xcoffout.h
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/libcc1plugin.so
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/libcc1plugin.so.0
 gcc-arm-embedded-%%FULL_VERSION%%/lib/gcc/%%TARGET%%/%%GCC_VERSION%%/plugin/libcp1plugin.so
@@ -3583,7 +3567,6 @@
 %%PYGDB%%gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/share/gdb/python/gdb/xmethod.py
 %%PYGDB%%gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gdb-py
 %%PYGDB%%gcc-arm-embedded-%%FULL_VERSION%%/bin/%%TARGET%%-gdb-add-index-py
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/man/man1/%%TARGET%%-addr2line.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/man/man1/%%TARGET%%-ar.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/man/man1/%%TARGET%%-as.1.gz
@@ -3614,8 +3597,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/man/man7/fsf-funding.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/man/man7/gfdl.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/man/man7/gpl.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/release.txt
 %%PORTDOCS%%%%HTML%%%%DOCSDIR%%/html/annotate/Annotations-for-Running.html
 %%PORTDOCS%%%%HTML%%%%DOCSDIR%%/html/annotate/Annotations-Overview.html
 %%PORTDOCS%%%%HTML%%%%DOCSDIR%%/html/annotate/Breakpoint-Info.html
@@ -6733,32 +6714,3 @@
 %%PORTDOCS%%%%PDF%%%%DOCSDIR%%/pdf/libm.pdf
 %%PORTDOCS%%%%PDF%%%%DOCSDIR%%/pdf/refcard.pdf
 %%PORTDOCS%%%%PDF%%%%DOCSDIR%%/pdf/stabs.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.gitreview
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ldscripts/gcc.ld
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ldscripts/mem.ld
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ldscripts/multi-ram.ld
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ldscripts/nokeep.ld
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/readme.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/cpp/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/cpp/cpp.cc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/fpin/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/fpin/fpin.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/fpout/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/fpout/fpout.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/makefile.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/minimum/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/minimum/minimum.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/multiram/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/multiram/multiram.cc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/qemu/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/qemu/hello.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/retarget/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/retarget/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/retarget/retarget.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/semihost/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/semihost/semihost.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/startup/startup_ARMCM0.S
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/startup/startup_ARMCM3.S
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/startup/startup_ARMCM4.S
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/startup/startup_ARMCM7.S